Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / libavformat / oggparsecelt.c

diff --git a/src/third_party/ffmpeg/libavformat/oggparsecelt.c b/src/third_party/ffmpeg/libavformat/oggparsecelt.c
index d6e9962..51ebc35 100644 (file)
--- a/src/third_party/ffmpeg/libavformat/oggparsecelt.c
+++ b/src/third_party/ffmpeg/libavformat/oggparsecelt.c
@@ -42,7 +42,7 @@ static int celt_header(AVFormatContext *s, int idx)
         !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;
 
         priv = av_malloc(sizeof(struct oggcelt_private));
@@ -56,7 +56,6 @@ static int celt_header(AVFormatContext *s, int idx)
         /* unused header size field skipped */
         sample_rate      = AV_RL32(p + 36);
         nb_channels      = AV_RL32(p + 40);
-        frame_size       = AV_RL32(p + 44);
         overlap          = AV_RL32(p + 48);
         /* unused bytes per packet field skipped */
         extra_headers    = AV_RL32(p + 56);
@@ -64,7 +63,6 @@ static int celt_header(AVFormatContext *s, int idx)
         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;
         if (sample_rate)
             avpriv_set_pts_info(st, 64, 1, sample_rate);
         priv->extra_headers_left  = 1 + extra_headers;
@@ -76,7 +74,7 @@ static int celt_header(AVFormatContext *s, int idx)
     } else if (priv && priv->extra_headers_left) {
         /* Extra headers (vorbiscomment) */
 
-        ff_vorbis_comment(s, &st->metadata, p, os->psize);
+        ff_vorbis_comment(s, &st->metadata, p, os->psize, 1);
         priv->extra_headers_left--;
         return 1;
     } else {