diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 21:22:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 21:25:10 +0200 |
| commit | cacc1dcadc788648779ea58201a8af25c2290676 (patch) | |
| tree | 9687606398b46c5ac6aaaef2656f2c610bf1fe7c /libavcodec/imc.c | |
| parent | 1b54e6b12bcf3090266ea632e52e8f8fe946397b (diff) | |
| parent | 1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d (diff) | |
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imc.c')
| -rw-r--r-- | libavcodec/imc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 2a5eac9b7c..dcedbd63b2 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -887,14 +887,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 |