[FFmpeg-cvslog] avformat/avidec: Skip duplicate strf chunks

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 02:04:59 2013 +0100| [9cbe834dfd49c287e6f2033388d0cc5ac290717a] | committer: Michael Niedermayer

avformat/avidec: Skip duplicate strf chunks

Fixes Ticket3119

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 8028ecb..6debfbe 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -623,6 +623,10 @@ static int avi_read_header(AVFormatContext *s)
                 if (cur_pos < list_end)
                     size = FFMIN(size, list_end - cur_pos);
                 st = s->streams[stream_index];
+                if (st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN) {
+                    avio_skip(pb, size);
+                    break;
+                }
                 switch (codec_type) {
                 case AVMEDIA_TYPE_VIDEO:
                     if (amv_file_format) {