Browse Source

Do not limit blocksize when reading PCM from aiff.

Fixes ticket #3695.
tags/n2.3
Carl Eugen Hoyos Michael Niedermayer 11 years ago
parent
commit
763e714442
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      libavformat/aiffdec.c

+ 8
- 2
libavformat/aiffdec.c View File

@@ -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)


Loading…
Cancel
Save