[SCM] libav/experimental: * don't show header errors when eof is reached

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:34:02 UTC 2013


The following commit has been merged in the experimental branch:
commit 5acdd6e6e2fb181b24e63d0b3ee20dd2fca9478f
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date:   Tue Nov 5 10:14:48 2002 +0000

    * don't show header errors when eof is reached
    
    Originally committed as revision 1165 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/asf.c b/libav/asf.c
index cdbcd7f..bf2b942 100644
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -969,12 +969,14 @@ static int asf_get_packet(AVFormatContext *s)
     int rsize = 11;
     int c = get_byte(pb);
     if (c != 0x82) {
-	printf("BAD HRD %x  at:%Ld\n", c, url_ftell(pb));
+        if (!url_feof(pb))
+	    printf("ff asf bad header %x  at:%Ld\n", c, url_ftell(pb));
 	return -EIO;
     }
     if ((c & 0x0f) == 2) { // always true for now
 	if (get_le16(pb) != 0) {
-	    printf("ff asf BAD NO ZERO\n");
+            if (!url_feof(pb))
+		printf("ff asf bad non zero\n");
 	    return -EIO;
 	}
     }
@@ -1022,7 +1024,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
 	    url_fskip(pb, ret);
 	    ret = asf_get_packet(s);
 	    //printf("READ ASF PACKET  %d   r:%d   c:%d\n", ret, asf->packet_size_left, pc++);
-	    if (ret < 0)
+	    if (ret < 0 || url_feof(pb))
 		return -EIO;
             asf->packet_time_start = 0;
             continue;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list