[SCM] libav/experimental: dont skip too many bytes if tag is TAG_STREAMHEAD2 and mp3

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 17230c9d4d005a1d4db0b3c278649f0830fdf0be
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Jan 5 14:17:41 2007 +0000

    dont skip too many bytes if tag is TAG_STREAMHEAD2 and mp3
    
    Originally committed as revision 7408 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/swf.c b/libavformat/swf.c
index 6029e36..caadc9d 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -822,13 +822,10 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             get_byte(pb);
             v = get_byte(pb);
             swf->samples_per_frame = get_le16(pb);
-            if (len!=4)
+            if (len > 4)
                 url_fskip(pb,len-4);
             /* if mp3 streaming found, OK */
             if ((v & 0x20) != 0) {
-                if ( tag == TAG_STREAMHEAD2 ) {
-                    get_le16(pb);
-                }
                 ast = av_new_stream(s, 1);
                 if (!ast)
                     return -ENOMEM;

-- 
Libav/FFmpeg packaging