summaryrefslogtreecommitdiff
path: root/libavcodec/arm/idctdsp_init_armv6.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-27 14:16:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-27 14:21:36 +0200
commitb051a1bbb965ce43caa44476e806bf170a9129c2 (patch)
tree9000e1594ebbd20d04ed87a84521573d064fc954 /libavcodec/arm/idctdsp_init_armv6.c
parentc2ef844aa74c56b72a135fb389e346845ed7be50 (diff)
avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/idctdsp_init_armv6.c')
-rw-r--r--libavcodec/arm/idctdsp_init_armv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/idctdsp_init_armv6.c b/libavcodec/arm/idctdsp_init_armv6.c
index 510508295c..648f1fdfc1 100644
--- a/libavcodec/arm/idctdsp_init_armv6.c
+++ b/libavcodec/arm/idctdsp_init_armv6.c
@@ -33,7 +33,7 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
{
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_SIMPLEARMV6) {
c->idct_put = ff_simple_idct_put_armv6;
c->idct_add = ff_simple_idct_add_armv6;