imc: fix order of operations in coefficients read

Reported-by: Ruoyu <liangry@ucweb.com>
This commit is contained in:
Vittorio Giovara 2014-10-13 15:42:28 +01:00
parent e5cfc8fdad
commit 1ac5a29b2e

View File

@ -873,14 +873,14 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch)
flag = get_bits1(&q->gb); flag = get_bits1(&q->gb);
if (stream_format_code & 0x1) 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); imc_read_level_coeffs_raw(q, stream_format_code, chctx->levlCoeffBuf);
else else
imc_read_level_coeffs(q, stream_format_code, chctx->levlCoeffBuf); 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, imc_decode_level_coefficients(q, chctx->levlCoeffBuf,
chctx->flcoeffs1, chctx->flcoeffs2); chctx->flcoeffs1, chctx->flcoeffs2);
else else