Changeset 207d9eab in ffmpeg


Ignore:
Timestamp:
Dec 16, 2011, 3:58:20 PM (13 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ee181f84
Parents:
559ae20d
git-author:
Michael Niedermayer <michaelni@gmx.at> (12/16/11 14:44:29)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (12/16/11 15:58:20)
Message:

txd/westwood: remove demuxer specific overallocate solutions as the new generic code
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Location:
libavformat
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libavformat/txd.c

    r559ae20d r207d9eab  
    5050    /* the parameters will be extracted from the compressed bitstream */
    5151
    52     s->pb->maxsize= avio_size(s->pb);
    53 
    5452    return 0;
    5553}
  • libavformat/westwood.c

    r559ae20d r207d9eab  
    321321
    322322    while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) {
    323         int64_t filesize= avio_size(s->pb);
    324323        chunk_type = AV_RB32(&preamble[0]);
    325324        chunk_size = AV_RB32(&preamble[4]);
    326 
    327         if(filesize>=0 && chunk_size > filesize){
    328             av_log(s, AV_LOG_ERROR, "Chunk with size %d truncated\n", chunk_size);
    329             chunk_size= filesize;
    330         }
    331325
    332326        skip_byte = chunk_size & 0x01;
Note: See TracChangeset for help on using the changeset viewer.