Fix demuxing of AVIs with pad streams.

Originally committed as revision 5271 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index f491878189..d7830b86f2 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -290,6 +290,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
             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];