summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <[email protected]>2014-01-07 22:49:05 +0100
committerCarl Eugen Hoyos <[email protected]>2014-01-08 10:19:52 +0100
commita48440d85737bcf23697780c4164acb7d60d6c59 (patch)
tree667ff967f3e328f6c662f50219c16189ff3afcdf
parentde14fe7e297f1e73223a9594e1fb3ff4fc7b529e (diff)
Use the h264 parser when decoding VSSH in avi.
Fixes ticket #3261 visually. Analyzed-by: Michael Doilnitsyn (cherry picked from commit 94cf4f8bac12c58e30ce3b5d72cf5898baafe9a8)
-rw-r--r--libavformat/avidec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 81f4b18427..10116bd2a7 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) {