Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/oggparsecelt.c

@@@ -42,13 -42,15 +42,13 @@@ static int celt_header(AVFormatContext 
          !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
          /* Main header */
  
-         uint32_t version, sample_rate, nb_channels, frame_size;
+         uint32_t version, sample_rate, nb_channels;
          uint32_t overlap, extra_headers;
 -        uint8_t *extradata;
  
 -        extradata = av_malloc(2 * sizeof(uint32_t) +
 -                              FF_INPUT_BUFFER_PADDING_SIZE);
          priv = av_malloc(sizeof(struct oggcelt_private));
 -        if (!extradata || !priv) {
 -            av_free(extradata);
 +        if (!priv)
 +            return AVERROR(ENOMEM);
 +        if (ff_alloc_extradata(st->codec, 2 * sizeof(uint32_t)) < 0) {
              av_free(priv);
              return AVERROR(ENOMEM);
          }
@@@ -64,7 -67,8 +63,6 @@@
          st->codec->codec_id       = AV_CODEC_ID_CELT;
          st->codec->sample_rate    = sample_rate;
          st->codec->channels       = nb_channels;
-         st->codec->frame_size     = frame_size;
 -        st->codec->extradata      = extradata;
 -        st->codec->extradata_size = 2 * sizeof(uint32_t);
          if (sample_rate)
              avpriv_set_pts_info(st, 64, 1, sample_rate);
          priv->extra_headers_left  = 1 + extra_headers;