Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

header parser fix

Browse source 
Originally committed as revision 2707 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-01-14 21:50:05 +00:00
parent 1305a9d55e
commit 29962fea47
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libavformat/asf.c
View file

@ -1062,12 +1062,15 @@ static int asf_get_packet(AVFormatContext *s)
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
uint32_t packet_length, padsize; uint32_t packet_length, padsize;
int rsize = 11; int rsize = 9;
int c = get_byte(pb); int c;
assert((url_ftell(&s->pb) - s->data_offset) % asf->packet_size == 0);
c = get_byte(pb);
if (c != 0x82) { if (c != 0x82) {
if (!url_feof(pb)) if (!url_feof(pb))
printf("ff asf bad header %x at:%lld\n", c, url_ftell(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 ((c & 0x0f) == 2) { // always true for now
if (get_le16(pb) != 0) { if (get_le16(pb) != 0) {
@ -1075,6 +1078,11 @@ static int asf_get_packet(AVFormatContext *s)
printf("ff asf bad non zero\n"); printf("ff asf bad non zero\n");
return -EIO; 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); asf->packet_flags = get_byte(pb);