[FFmpeg-cvslog] avformat/wtvdec: demux mpeg2 extradata

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sun Mar 30 12:43:19 2014 +1100| [73a2d16bfab550325f6626c9843c2e019ef7331b] | committer: Michael Niedermayer

avformat/wtvdec: demux mpeg2 extradata

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73a2d16bfab550325f6626c9843c2e019ef7331b
---

 libavformat/wtvdec.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 834198f..45e6b4a 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -694,6 +694,15 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
             avio_skip(pb, FFMAX(size - consumed, 0));
         } else if (!ff_guidcmp(formattype, ff_format_mpeg2_video)) {
             int consumed = parse_videoinfoheader2(s, st);
+            int count;
+            avio_skip(pb, 4);
+            count = avio_rl32(pb);
+            avio_skip(pb, 12);
+            if (count && ff_get_extradata(st->codec, pb, count) < 0) {
+               ff_free_stream(s, st);
+               return NULL;
+            }
+            consumed += 20 + count;
             avio_skip(pb, FFMAX(size - consumed, 0));
         } else {
             if (ff_guidcmp(formattype, ff_format_none))