virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Do not limit blocksize when reading PCM from aiff.

Browse Source 
Fixes ticket #3695.
This commit is contained in:
Carl Eugen Hoyos
2014-06-03 00:54:46 +02:00
committed by Michael Niedermayer
parent c17973f19a
commit 763e714442
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/aiffdec.c
View File

@@ -344,10 +344,16 @@ static int aiff_read_packet(AVFormatContext *s,
return AVERROR_EOF; return AVERROR_EOF;
/* Now for that packet */ /* Now for that packet */
if (st->codec->block_align >= 17) // GSM, QCLP, IMA4 switch (st->codec->codec_id) {
case AV_CODEC_ID_ADPCM_IMA_QT:
case AV_CODEC_ID_GSM:
case AV_CODEC_ID_QDM2:
case AV_CODEC_ID_QCELP:
size = st->codec->block_align; size = st->codec->block_align;
else break;
default:
size = (MAX_SIZE / st->codec->block_align) * st->codec->block_align; size = (MAX_SIZE / st->codec->block_align) * st->codec->block_align;
}
size = FFMIN(max_size, size); size = FFMIN(max_size, size);
res = av_get_packet(s->pb, pkt, size); res = av_get_packet(s->pb, pkt, size);
if (res < 0) if (res < 0)