[FFmpeg-cvslog] Use the h264 parser when decoding VSSH in avi.

Carl Eugen Hoyos git at videolan.org
Wed Jan 8 10:28:33 CET 2014


ffmpeg | branch: release/2.1 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jan  7 22:49:05 2014 +0100| [a48440d85737bcf23697780c4164acb7d60d6c59] | 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)

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

 libavformat/avidec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 81f4b18..10116bd 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -685,6 +685,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) {



More information about the ffmpeg-cvslog mailing list