From bf7d93e15783dcff978e8139dbd1f953028fb5a5 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Mon, 31 Mar 2014 21:56:43 +1100 Subject: 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 Signed-off-by: Michael Niedermayer --- libavcodec/adpcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavcodec/adpcm.c') 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) -- cgit v1.2.3