[SCM] libav/experimental: block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:38:06 UTC 2013
The following commit has been merged in the experimental branch:
commit ca1d62f45dab68d2bcef36e5e94aea829af4fc20
Author: Assaf Yaari <assafy at mobixell.com>
Date: Sun Oct 26 09:49:45 2003 +0000
block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)
Originally committed as revision 2437 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index a6ecaf5..9965402 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list