virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

txd/westwood: remove demuxer specific overallocate solutions as the new generic code

Browse Source 
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-16 15:44:29 +01:00
parent 559ae20dda
commit 207d9eab5a
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/txd.c
View File

@ -49,8 +49,6 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
st->codec->time_base.num = 1; st->codec->time_base.num = 1;
/* the parameters will be extracted from the compressed bitstream */ /* the parameters will be extracted from the compressed bitstream */
s->pb->maxsize= avio_size(s->pb);
return 0; return 0;
} }

6
libavformat/westwood.c
View File

@ -320,15 +320,9 @@ static int wsvqa_read_packet(AVFormatContext *s,
int skip_byte; int skip_byte;
while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) { 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_type = AV_RB32(&preamble[0]);
chunk_size = AV_RB32(&preamble[4]); 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; skip_byte = chunk_size & 0x01;
if ((chunk_type == SND2_TAG || chunk_type == SND1_TAG) && wsvqa->audio_channels == 0) { if ((chunk_type == SND2_TAG || chunk_type == SND1_TAG) && wsvqa->audio_channels == 0) {