diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-03 00:54:46 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-09 23:48:10 +0200 |
| commit | d1b62a9a07719480f6d306420f1abac3fc07cfa2 (patch) | |
| tree | be9583b6f564cc9182769b9a325a0d0ed636517f | |
| parent | 29c8fac3f72c4a6e8c5e2492d0edcb6b979ac9d4 (diff) | |
| download | ffmpeg-d1b62a9a07719480f6d306420f1abac3fc07cfa2.tar.gz | |
Do not limit blocksize when reading PCM from aiff.
Fixes ticket #3695.
(cherry picked from commit 763e714442e07f6430b003c8a9f4b62deaa7b3a5)
| -rw-r--r-- | libavformat/aiffdec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 81bcc64a0c..7accec453f 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -344,10 +344,16 @@ static int aiff_read_packet(AVFormatContext *s, return AVERROR_EOF; /* 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; - else + break; + default: size = (MAX_SIZE / st->codec->block_align) * st->codec->block_align; + } size = FFMIN(max_size, size); res = av_get_packet(s->pb, pkt, size); if (res < 0) |