RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Originally committed as revision 2437 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Assaf Yaari 2003-10-26 09:49:45 +00:00 committed by Michael Niedermayer
parent 6e0593e80b
commit ca1d62f45d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/adpcm.c
View File

@ -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)
buf_size = avctx->block_align;
else
buf_size = BLKSIZE;
}
if (avctx->block_align != 0 && buf_size > avctx->block_align)
buf_size = avctx->block_align;
// 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)
buf_size = avctx->block_align;
else
buf_size = BLKSIZE;
}
if (avctx->block_align != 0 && buf_size > avctx->block_align)
buf_size = avctx->block_align;
n = buf_size - 7 * avctx->channels;
if (n < 0)
return -1;