diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:10:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:11:30 +0200 |
| commit | 7da1e8a0d89159912ff1b1ac0525e5e8719f2c52 (patch) | |
| tree | a166874bfea9c1148776e557fde89f848149127c | |
| parent | 8b0a063ba912b9844d8e7cf4d8f9014832f77687 (diff) | |
| parent | aa3ec219e1a5cc0e96ddec6ea83312ec780448f5 (diff) | |
| download | ffmpeg-7da1e8a0d89159912ff1b1ac0525e5e8719f2c52.tar.gz | |
Merge commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5' into release/2.4
* commit 'aa3ec219e1a5cc0e96ddec6ea83312ec780448f5':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c0b8b2bba8198af2823521c654a48f4
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -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 dcedbd63b2..5122f558c4 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -1018,7 +1018,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"); |