From 99e5a9d1ea2a61ac9429427431e5b9c2fefb76a5 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 22 Jul 2009 22:27:10 +0000 Subject: Do not redundantly check for both CONFIG_THEORA_DECODER and CONFIG_VP3_DECODER. The Theora decoder depends on the VP3 decoder. Originally committed as revision 19492 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/arm/dsputil_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/arm/dsputil_arm.c') diff --git a/libavcodec/arm/dsputil_arm.c b/libavcodec/arm/dsputil_arm.c index c0ab0c9c7a..3bc2d62d02 100644 --- a/libavcodec/arm/dsputil_arm.c +++ b/libavcodec/arm/dsputil_arm.c @@ -184,7 +184,7 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) c->idct_add= ff_simple_idct_add_neon; c->idct = ff_simple_idct_neon; c->idct_permutation_type = FF_PARTTRANS_IDCT_PERM; - } else if ((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER || CONFIG_THEORA_DECODER) && + } else if ((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER) && idct_algo==FF_IDCT_VP3){ c->idct_put= ff_vp3_idct_put_neon; c->idct_add= ff_vp3_idct_add_neon; -- cgit v1.2.3