Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / oggparsecelt.c

diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index b3c8660c9dcbd5fa1481c93f8d298586f71327a3..2adc06046aea21a2f38c9cd659f85feea9f11b04 100644 (file)
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -41,8 +41,8 @@ static int celt_header(AVFormatContext *s, int idx)
 
         /* Main header */
 
-        uint32_t version, header_size, sample_rate, nb_channels, frame_size;
-        uint32_t overlap, bytes_per_packet, extra_headers;
+        uint32_t version, header_size av_unused, sample_rate, nb_channels, frame_size;
+        uint32_t overlap, bytes_per_packet av_unused, extra_headers;
         uint8_t *extradata;
 
         extradata = av_malloc(2 * sizeof(uint32_t) +
@@ -61,22 +61,21 @@ static int celt_header(AVFormatContext *s, int idx)
         overlap          = AV_RL32(p + 48);
         bytes_per_packet = AV_RL32(p + 52); /* unused */
         extra_headers    = AV_RL32(p + 56);
-        av_free(os->private);
-        av_free(st->codec->extradata);
         st->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id       = CODEC_ID_CELT;
         st->codec->sample_rate    = sample_rate;
         st->codec->channels       = nb_channels;
         st->codec->frame_size     = frame_size;
         st->codec->sample_fmt     = AV_SAMPLE_FMT_S16;
-        st->codec->extradata      = extradata;
-        st->codec->extradata_size = 2 * sizeof(uint32_t);
-        if (sample_rate)
-            av_set_pts_info(st, 64, 1, sample_rate);
+        av_set_pts_info(st, 64, 1, sample_rate);
         priv->extra_headers_left  = 1 + extra_headers;
+        av_free(os->private);
         os->private = priv;
         AV_WL32(extradata + 0, overlap);
         AV_WL32(extradata + 4, version);
+        av_free(st->codec->extradata);
+        st->codec->extradata = extradata;
+        st->codec->extradata_size = 2 * sizeof(uint32_t);
         return 1;
 
     } else if(priv && priv->extra_headers_left) {