diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 13:21:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 13:21:40 +0100 |
| commit | 3b7db9c4f55ddc51f5f29d169d379fe2c6402b11 (patch) | |
| tree | 97a8b3c34db9eb623dc368296e1d37eb5c19a1ee | |
| parent | 0ddcee172ec8a8abc91c61c3a66bbfd432373976 (diff) | |
| parent | e443165c323406d01da7e7930f042d265d01fb35 (diff) | |
| download | ffmpeg-3b7db9c4f55ddc51f5f29d169d379fe2c6402b11.tar.gz | |
Merge commit 'e443165c323406d01da7e7930f042d265d01fb35' into release/2.4
* commit 'e443165c323406d01da7e7930f042d265d01fb35':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 |