[FFmpeg-cvslog] Use the h264 parser when decoding VSSH in avi.
Carl Eugen Hoyos
git at videolan.org
Thu Jan 9 11:53:37 CET 2014
ffmpeg | branch: release/1.1 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jan 7 22:49:05 2014 +0100| [3ada932202ae919d432e7337baaf2ff3b0a22859] | committer: Carl Eugen Hoyos
Use the h264 parser when decoding VSSH in avi.
Fixes ticket #3261 visually.
Analyzed-by: Michael Doilnitsyn
(cherry picked from commit 94cf4f8bac12c58e30ce3b5d72cf5898baafe9a8)
Conflicts:
libavformat/avidec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ada932202ae919d432e7337baaf2ff3b0a22859
---
libavformat/avidec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index c8d5818..f33d3a7 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -636,6 +636,8 @@ static int avi_read_header(AVFormatContext *s)
st->codec->codec_tag = tag1;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts.
+ if (st->codec->codec_tag == MKTAG('V', 'S', 'S', 'H'))
+ st->need_parsing = AVSTREAM_PARSE_FULL;
if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){
st->codec->extradata_size+= 9;
More information about the ffmpeg-cvslog
mailing list