diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 17:43:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 17:44:13 +0200 |
| commit | 551813a963b2c04d0211a6c87ecd400bdcf2c5f7 (patch) | |
| tree | cbc953e59f298f5928ca9d4b94aa3c75088da98b /libavcodec | |
| parent | 840465ebf979ee4fbab308f1019aa6f7026373c7 (diff) | |
| parent | 210921722bf828b3b895ebcbc34374e6c4452c6f (diff) | |
| download | ffmpeg-551813a963b2c04d0211a6c87ecd400bdcf2c5f7.tar.gz | |
Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/imc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 2fa910a5e5..b062b216e8 100644 --- 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"); |