From 73a2d16bfab550325f6626c9843c2e019ef7331b Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Sun, 30 Mar 2014 12:43:19 +1100 Subject: avformat/wtvdec: demux mpeg2 extradata Signed-off-by: Peter Ross Signed-off-by: Michael Niedermayer --- libavformat/wtvdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libavformat') diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 834198fe59..45e6b4ae8f 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)) -- cgit v1.2.3