ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Jul 27 14:16:07 2014 +0200| [b051a1bbb965ce43caa44476e806bf170a9129c2] | committer: Michael Niedermayer
avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b051a1bbb965ce43caa44476e806bf170a9129c2 --- libavcodec/arm/idctdsp_init_arm.c | 2 +- libavcodec/arm/idctdsp_init_armv6.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c index 31d9428..578697e 100644 --- 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; diff --git a/libavcodec/arm/idctdsp_init_armv6.c b/libavcodec/arm/idctdsp_init_armv6.c index 5105082..648f1fd 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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
