Merge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'

[ffmpeg] / libavformat / avidec.c

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 1a4f1b55ec66ad614c448710604ab66503886b17..2e2d03c764d4f86a4cb314ff623f84a6797b6602 100644 (file)
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -817,6 +817,8 @@ static int avi_read_header(AVFormatContext *s)
 
                     if (st->codec->codec_tag == MKTAG('V', 'S', 'S', 'H'))
                         st->need_parsing = AVSTREAM_PARSE_FULL;
+                    if (st->codec->codec_id == AV_CODEC_ID_RV40)
+                        st->need_parsing = AVSTREAM_PARSE_NONE;
 
                     if (st->codec->codec_tag == 0 && st->codec->height > 0 &&
                         st->codec->extradata_size < 1U << 30) {