[SCM] libav/experimental: just skip klv packet, when no corresponding stream is found

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8c2a20701959c2062dbb314a9d5341a9744d7c02
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Mar 16 17:54:36 2008 +0000

    just skip klv packet, when no corresponding stream is found
    
    Originally committed as revision 12464 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 5a824ac..4d4bcbb 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -350,8 +350,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
             int index = mxf_get_stream_index(s, &klv);
             if (index < 0) {
                 av_log(s, AV_LOG_ERROR, "error getting stream index\n");
-                url_fskip(s->pb, klv.length);
-                return -1;
+                goto skip;
             }
             if (s->streams[index]->discard == AVDISCARD_ALL)
                 goto skip;

-- 
Libav/FFmpeg packaging