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

Michael Niedermayer committed 12 years ago

Commit b051a1b1 parent c2ef8442 files · +2 −2Browse files

Unified · Split

2 files

libavcodec/arm/idctdsp_init_arm.c +1 −1
libavcodec/arm/idctdsp_init_armv6.c +1 −1

libavcodec/arm/idctdsp_init_arm.c+1−1

@@ -71,7 +71,7 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext c, AVCodecContext avctx, · 70 unmodified lines
71	ff_add_pixels_clamped = c->add_pixels_clamped;	71	ff_add_pixels_clamped = c->add_pixels_clamped;
72		72
73	if (!avctx->lowres && !high_bit_depth) {	73	if (!avctx->lowres && !high_bit_depth) {
74	if (avctx->idct_algo == FF_IDCT_AUTO \|\|	74	if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) \|\|
75	avctx->idct_algo == FF_IDCT_ARM) {	75	avctx->idct_algo == FF_IDCT_ARM) {
76	c->idct_put = j_rev_dct_arm_put;	76	c->idct_put = j_rev_dct_arm_put;
77	c->idct_add = j_rev_dct_arm_add;	77	c->idct_add = j_rev_dct_arm_add;

libavcodec/arm/idctdsp_init_armv6.c+1−1

@@ -33,7 +33,7 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext c, AVCodecContext avctx, · 32 unmodified lines
33	unsigned high_bit_depth)	33	unsigned high_bit_depth)
34	{	34	{
35	if (!avctx->lowres && !high_bit_depth) {	35	if (!avctx->lowres && !high_bit_depth) {
36	if (avctx->idct_algo == FF_IDCT_AUTO \|\|	36	if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) \|\|
37	avctx->idct_algo == FF_IDCT_SIMPLEARMV6) {	37	avctx->idct_algo == FF_IDCT_SIMPLEARMV6) {
38	c->idct_put = ff_simple_idct_put_armv6;	38	c->idct_put = ff_simple_idct_put_armv6;
39	c->idct_add = ff_simple_idct_add_armv6;	39	c->idct_add = ff_simple_idct_add_armv6;