Merge commit '990e2f3555bb0adae122d3599938ddcfee46e2d1'

[ffmpeg] / libavcodec / arm / idctdsp_init_arm.c

diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c
index 31d9428a8b72c54899175d0b32e969cee86a2dbc..578697e88ef4241930bc8362362db080c4bef2e3 100644 (file)
--- a/libavcodec/arm/idctdsp_init_arm.c
+++ b/libavcodec/arm/idctdsp_init_arm.c
@@ -71,7 +71,7 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
     ff_add_pixels_clamped = c->add_pixels_clamped;
 
     if (!avctx->lowres && !high_bit_depth) {
-        if (avctx->idct_algo == FF_IDCT_AUTO ||
+        if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) ||
             avctx->idct_algo == FF_IDCT_ARM) {
             c->idct_put  = j_rev_dct_arm_put;
             c->idct_add  = j_rev_dct_arm_add;