aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-10-13 15:42:28 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-10-15 14:51:19 +0100
commite443165c323406d01da7e7930f042d265d01fb35 (patch)
tree8ee4d352f21a54ae25df2d69682be1b9239681a4
parent0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b (diff)
downloadffmpeg-e443165c323406d01da7e7930f042d265d01fb35.tar.gz
imc: fix order of operations in coefficients read
Reported-by: Ruoyu <liangry@ucweb.com>
-rw-r--r--libavcodec/imc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 41ca8c8ec8..500f56408d 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -873,14 +873,14 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
flag = get_bits1(&q->gb);
if (stream_format_code & 0x1)
- imc_decode_level_coefficients_raw(q, chctx->levlCoeffBuf,
- chctx->flcoeffs1, chctx->flcoeffs2);
- else if (stream_format_code & 0x1)
imc_read_level_coeffs_raw(q, stream_format_code, chctx->levlCoeffBuf);
else
imc_read_level_coeffs(q, stream_format_code, chctx->levlCoeffBuf);
- if (stream_format_code & 0x4)
+ if (stream_format_code & 0x1)
+ imc_decode_level_coefficients_raw(q, chctx->levlCoeffBuf,
+ chctx->flcoeffs1, chctx->flcoeffs2);
+ else if (stream_format_code & 0x4)
imc_decode_level_coefficients(q, chctx->levlCoeffBuf,
chctx->flcoeffs1, chctx->flcoeffs2);
else