From 5c69a4fd682ae479f0921361b7953e6163bd3064 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 26 Oct 2003 09:56:21 +0000 Subject: [PATCH] fixing the remaning block-align checks Originally committed as revision 2438 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adpcm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 9965402e58..c86c8a7288 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -648,12 +648,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx, } break; case CODEC_ID_ADPCM_IMA_DK4: - if (buf_size > BLKSIZE) { - if (avctx->block_align != 0) - buf_size = avctx->block_align; - else - buf_size = BLKSIZE; - } + if (avctx->block_align != 0 && buf_size > avctx->block_align) + buf_size = avctx->block_align; + c->status[0].predictor = (src[0] | (src[1] << 8)); c->status[0].step_index = src[2]; src += 4; @@ -687,12 +684,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx, } break; case CODEC_ID_ADPCM_IMA_DK3: - if (buf_size > BLKSIZE) { - if (avctx->block_align != 0) - buf_size = avctx->block_align; - else - buf_size = BLKSIZE; - } + if (avctx->block_align != 0 && buf_size > avctx->block_align) + buf_size = avctx->block_align; + c->status[0].predictor = (src[10] | (src[11] << 8)); c->status[1].predictor = (src[12] | (src[13] << 8)); c->status[0].step_index = src[14];