[Ffmpeg-devel] [PATCH] Fix demuxing of AVIs with padding stream

[Kostya]

As I described in another message, FFmpeg fails on demuxing of AVIs with padding stream present.
(www.mplayerhq.hu/MPlayer/samples/V-codecs/KMVC/{logo1.avi,mine.avi}, maybe more).
I found that this is caused by not ignoring padding stream.

Attached patch moves this check for 'pads' stream to the place where check for number of streams
occur (there is a switch..case later, but in this case it won't be reached).
-------------- next part --------------
--- /home/kst/cvs-get/ffmpeg/libavformat/avidec.c	2006-03-02 16:50:31.000000000 +0200
+++ avidec.c	2006-04-05 05:53:18.000000000 +0300
@@ -290,6 +290,9 @@
 
             if (stream_index >= s->nb_streams) {
                 url_fskip(pb, size - 8);
+                /* ignore padding stream */
+                if (tag1 == MKTAG('p', 'a', 'd', 's'))
+                    stream_index--;
                 break;
             }
             st = s->streams[stream_index];