[FFmpeg-cvslog] lavf/avidec: Do not fail for very large idx1 tags.

Carl Eugen Hoyos git at videolan.org
Tue Oct 18 01:29:53 EEST 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Oct 17 18:25:48 2016 +0200| [a20f3238be9381518ef8e7fcbb2a4dc7b6acdc93] | committer: Carl Eugen Hoyos

lavf/avidec: Do not fail for very large idx1 tags.

Fixes demuxing the sample file from github pull request 197,
the size of its idx1 tag is 6171936 bytes, followed by a JUNK
tag of 9505704 bytes.

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 2c81267..b291625 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -993,6 +993,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
                 avi->movi_end  = avi->fsize;
                 goto end_of_header;
             }
+        /* Do not fail for very large idx1 tags */
+        case MKTAG('i', 'd', 'x', '1'):
             /* skip tag */
             size += (size & 1);
             avio_skip(pb, size);



More information about the ffmpeg-cvslog mailing list