On Mon, Aug 20, 2012 at 12:21:37PM -0400, Justin Ruggles wrote:
> Fixes invalid reads when encoding mono streams when trellis is used.
> ---
> libavcodec/adpcmenc.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
> index 038dbf1..843b32f 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)
> --
LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
