From: Michael Niedermayer Date: Wed, 10 Sep 2014 12:37:12 +0000 (+0200) Subject: avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO() X-Git-Tag: android-x86-6.0-r1~3154 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b7a39d7ea4b716608c4091cd25ae6c88bd0251a;p=android-x86%2Fexternal-ffmpeg.git avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO() Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 06dee35422..ea6cc23e97 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -509,7 +509,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* stereo: 4 bytes (8 samples) for left, 4 bytes for right */ if (avctx->trellis > 0) { - FF_ALLOC_OR_GOTO(avctx, buf, avctx->channels * blocks * 8, error); + FF_ALLOC_ARRAY_OR_GOTO(avctx, buf, avctx->channels, blocks * 8, error); for (ch = 0; ch < avctx->channels; ch++) { adpcm_compress_trellis(avctx, &samples_p[ch][1], buf + ch * blocks * 8, &c->status[ch],