Commit ca1d62f4 authored by Assaf Yaari's avatar Assaf Yaari Committed by Michael Niedermayer

block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)

Originally committed as revision 2437 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6e0593e8
......@@ -524,12 +524,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
}
break;
case CODEC_ID_ADPCM_IMA_WAV:
if (buf_size > BLKSIZE) {
if (avctx->block_align != 0)
if (avctx->block_align != 0 && buf_size > avctx->block_align)
buf_size = avctx->block_align;
else
buf_size = BLKSIZE;
}
// XXX: do as per-channel loop
cs = &(c->status[0]);
cs->predictor = (*src++) & 0x0FF;
......@@ -605,13 +602,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
break;
case CODEC_ID_ADPCM_MS:
if (buf_size > BLKSIZE) {
if (avctx->block_align != 0)
if (avctx->block_align != 0 && buf_size > avctx->block_align)
buf_size = avctx->block_align;
else
buf_size = BLKSIZE;
}
n = buf_size - 7 * avctx->channels;
if (n < 0)
return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment