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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 71235ec..7093e91 100644 (file)
--- 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;