txd/westwood: remove demuxer specific overallocate solutions as the new generic code
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Dec 2011 14:44:29 +0000 (15:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Dec 2011 15:58:20 +0000 (16:58 +0100)
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/txd.c
libavformat/westwood.c

index 284d532..06aca8c 100644 (file)
@@ -49,8 +49,6 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
     st->codec->time_base.num = 1;
     /* the parameters will be extracted from the compressed bitstream */
 
-    s->pb->maxsize= avio_size(s->pb);
-
     return 0;
 }
 
index b803b68..4cbd5be 100644 (file)
@@ -320,15 +320,9 @@ static int wsvqa_read_packet(AVFormatContext *s,
     int skip_byte;
 
     while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) {
-        int64_t filesize= avio_size(s->pb);
         chunk_type = AV_RB32(&preamble[0]);
         chunk_size = AV_RB32(&preamble[4]);
 
-        if(filesize>=0 && chunk_size > filesize){
-            av_log(s, AV_LOG_ERROR, "Chunk with size %d truncated\n", chunk_size);
-            chunk_size= filesize;
-        }
-
         skip_byte = chunk_size & 0x01;
 
         if ((chunk_type == SND2_TAG || chunk_type == SND1_TAG) && wsvqa->audio_channels == 0) {