diff options
| author | Peter Ross <pross@xvid.org> | 2014-03-31 21:56:43 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 13:18:19 +0200 |
| commit | bf7d93e15783dcff978e8139dbd1f953028fb5a5 (patch) | |
| tree | 591443d4d206a69104827bd8cb8d9883a9ee0b2d /libavcodec/adpcm.c | |
| parent | a9ccec527067bd83689ccdd1b4a3dcd908b0fb97 (diff) | |
| download | ffmpeg-bf7d93e15783dcff978e8139dbd1f953028fb5a5.tar.gz | |
avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R1
AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some
samples there is padding between the offset table and ADPCM data.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f7f82599b0..e31242f02c 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -555,17 +555,16 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, case AV_CODEC_ID_ADPCM_EA_R2: header_size = 4 + 5 * ch; *coded_samples = bytestream2_get_le32(gb); - *approx_nb_samples = 1; break; case AV_CODEC_ID_ADPCM_EA_R3: header_size = 4 + 5 * ch; *coded_samples = bytestream2_get_be32(gb); - *approx_nb_samples = 1; break; } *coded_samples -= *coded_samples % 28; nb_samples = (buf_size - header_size) * 2 / ch; nb_samples -= nb_samples % 28; + *approx_nb_samples = 1; break; case AV_CODEC_ID_ADPCM_IMA_DK3: if (avctx->block_align > 0) |