# HG changeset patch # User michael # Date 1067162181 0 # Node ID dbd0ede6623d41a1efc62a6faf8b5ad21afab40f # Parent bc4b13ca74deeb399fb64f9d8d102f04ff7eefdd fixing the remaning block-align checks diff -r bc4b13ca74de -r dbd0ede6623d adpcm.c --- a/adpcm.c Sun Oct 26 09:49:45 2003 +0000 +++ b/adpcm.c Sun Oct 26 09:56:21 2003 +0000 @@ -648,12 +648,9 @@ } 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 @@ } 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];