diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-20 12:18:58 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-08-22 12:43:51 -0400 |
| commit | 5d4ef004bfe85a006501d21373cce86c9bf32401 (patch) | |
| tree | 1f2a3e7bd65afd42fb1efefe03dcb77e8e8be649 | |
| parent | 7011a42b1abbf39ee02d50f5e4b2a10552d92ae2 (diff) | |
| download | ffmpeg-5d4ef004bfe85a006501d21373cce86c9bf32401.tar.gz | |
adpcm_swf: Use correct sample offsets when using trellis.
Fixes invalid reads when encoding mono streams when trellis is used.
| -rw-r--r-- | libavcodec/adpcmenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 038dbf1c5e..843b32fae5 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -615,10 +615,11 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->trellis > 0) { FF_ALLOC_OR_GOTO(avctx, buf, 2 * n, error); - adpcm_compress_trellis(avctx, samples + 2, buf, &c->status[0], n); + adpcm_compress_trellis(avctx, samples + avctx->channels, buf, + &c->status[0], n); if (avctx->channels == 2) - adpcm_compress_trellis(avctx, samples + 3, buf + n, - &c->status[1], n); + adpcm_compress_trellis(avctx, samples + avctx->channels + 1, + buf + n, &c->status[1], n); for (i = 0; i < n; i++) { put_bits(&pb, 4, buf[i]); if (avctx->channels == 2) |