Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'

* commit '210921722bf828b3b895ebcbc34374e6c4452c6f': imc: add required padding for GetBitContext buffer Conflicts: libavcodec/imc.c See: 7444cf9a9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 551813a963
parent 840465ebf9 210921722b
commit 551813a963
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@ -1021,7 +1021,7 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data,

    IMCContext *q = avctx->priv_data;

-    LOCAL_ALIGNED_16(uint16_t, buf16, [IMC_BLOCK_SIZE / 2 + FF_INPUT_BUFFER_PADDING_SIZE/2]);
+    LOCAL_ALIGNED_16(uint16_t, buf16, [(IMC_BLOCK_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) / 2]);

    if (buf_size < IMC_BLOCK_SIZE * avctx->channels) {
        av_log(avctx, AV_LOG_ERROR, "frame too small!\n");