[SCM] libav/experimental: header parser fix

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 29962fea47d1499cbd3716fcefd0d71b23d1869f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 14 21:50:05 2004 +0000

    header parser fix
    
    Originally committed as revision 2707 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 6c811ae..cdb3c3e 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -1062,12 +1062,15 @@ static int asf_get_packet(AVFormatContext *s)
     ASFContext *asf = s->priv_data;
     ByteIOContext *pb = &s->pb;
     uint32_t packet_length, padsize;
-    int rsize = 11;
-    int c = get_byte(pb);
+    int rsize = 9;
+    int c;
+    
+    assert((url_ftell(&s->pb) - s->data_offset) % asf->packet_size == 0);
+    
+    c = get_byte(pb);
     if (c != 0x82) {
         if (!url_feof(pb))
 	    printf("ff asf bad header %x  at:%lld\n", c, url_ftell(pb));
-	return -EIO;
     }
     if ((c & 0x0f) == 2) { // always true for now
 	if (get_le16(pb) != 0) {
@@ -1075,6 +1078,11 @@ static int asf_get_packet(AVFormatContext *s)
 		printf("ff asf bad non zero\n");
 	    return -EIO;
 	}
+        rsize+=2;
+/*    }else{
+        if (!url_feof(pb))
+	    printf("ff asf bad header %x  at:%lld\n", c, url_ftell(pb));
+	return -EIO;*/
     }
 
     asf->packet_flags = get_byte(pb);

-- 
Libav/FFmpeg packaging