Commit b051a1bb authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c2ef844a
...@@ -71,7 +71,7 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx, ...@@ -71,7 +71,7 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
ff_add_pixels_clamped = c->add_pixels_clamped; ff_add_pixels_clamped = c->add_pixels_clamped;
if (!avctx->lowres && !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_ARM) { avctx->idct_algo == FF_IDCT_ARM) {
c->idct_put = j_rev_dct_arm_put; c->idct_put = j_rev_dct_arm_put;
c->idct_add = j_rev_dct_arm_add; c->idct_add = j_rev_dct_arm_add;
......
...@@ -33,7 +33,7 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx, ...@@ -33,7 +33,7 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth) unsigned high_bit_depth)
{ {
if (!avctx->lowres && !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) { avctx->idct_algo == FF_IDCT_SIMPLEARMV6) {
c->idct_put = ff_simple_idct_put_armv6; c->idct_put = ff_simple_idct_put_armv6;
c->idct_add = ff_simple_idct_add_armv6; c->idct_add = ff_simple_idct_add_armv6;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment