diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 23:03:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 23:03:09 +0000 |
| commit | 236116cb4cfd6721d1872dd945d2cc8b563829da (patch) | |
| tree | 502b5d823c24fd7e71b8d99ee75751b6cb455cbf /libavformat/asf.c | |
| parent | b586d9eac3dc0f62db06e1eb28374690ef310275 (diff) | |
get rid of a few idiotic asserts()
Originally committed as revision 7632 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index 6b60dd6d2a..61b2fcdcdf 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -578,17 +578,14 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); //printf("key:%d stream:%d seq:%d offset:%d replic_size:%d\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, //asf->packet_frag_offset, asf->packet_replic_size); - if (asf->packet_replic_size > 1) { - assert(asf->packet_replic_size >= 8); - // it should be always at least 8 bytes - FIXME validate + if (asf->packet_replic_size >= 8) { asf->packet_obj_size = get_le32(pb); if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); continue; } asf->packet_frag_timestamp = get_le32(pb); // timestamp - if (asf->packet_replic_size > 8) - url_fskip(pb, asf->packet_replic_size - 8); + url_fskip(pb, asf->packet_replic_size - 8); rsize += asf->packet_replic_size; // FIXME - check validity } else if (asf->packet_replic_size==1){ // multipacket - frag_offset is begining timestamp @@ -598,8 +595,9 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) asf->packet_time_delta = get_byte(pb); rsize++; - }else{ - assert(asf->packet_replic_size==0); + }else if(asf->packet_replic_size!=0){ + av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); + continue; } if (asf->packet_flags & 0x01) { DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal |