summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorMaksym Veremeyenko <verem@m1stereo.tv>2009-08-25 09:46:16 +0000
committerDiego Biurrun <diego@biurrun.de>2009-08-25 09:46:16 +0000
commit7305d97f04f95e6b6717c5bba5cf6b350824094e (patch)
tree1e3f0e612d3344c1c256cfa777862cb002cc3ada /libavformat/avidec.c
parentc58b82a29be1e9e9c87a701b5511aeef9a0ac865 (diff)
Do not read index chunks as audio/video data; closes issue 1336.
patch by Maksym Veremeyenko, verem m1stereo tv Originally committed as revision 19700 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 71235ec47d..7093e9150d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -826,6 +826,12 @@ resync:
if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams)
continue;
+ //detect ##ix chunk and skip
+ if(d[2] == 'i' && d[3] == 'x' && n < s->nb_streams){
+ url_fskip(pb, size);
+ goto resync;
+ }
+
//parse ##dc/##wb
if(n < s->nb_streams){
AVStream *st;