]> git.sesse.net Git - ffmpeg/commitdiff
Use the h264 parser when decoding VSSH in avi.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 7 Jan 2014 21:49:05 +0000 (22:49 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 7 Jan 2014 21:49:05 +0000 (22:49 +0100)
Fixes ticket #3261 visually.

Analyzed-by: Michael Doilnitsyn
libavformat/avidec.c

index 17eb245332ca77c6e6dad03ef9b7c66d3ae60842..1f9fa149e1608e0166670c3bd1a185c5e41cb4d7 100644 (file)
@@ -688,6 +688,8 @@ static int avi_read_header(AVFormatContext *s)
                     /* This is needed to get the pict type which is necessary
                      * for generating correct pts. */
                     st->need_parsing = AVSTREAM_PARSE_HEADERS;
+                    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) {