# HG changeset patch
# User diego
# Date 1248301630 0
# Node ID d6d7e8d4a04d55e194b8d02f4b2342b7da2c6cfd
# Parent  2ccd77e59b0e2f731df626e89d7d940b08a5ff90
Do not redundantly check for both CONFIG_THEORA_DECODER and CONFIG_VP3_DECODER.
The Theora decoder depends on the VP3 decoder.

diff -r 2ccd77e59b0e -r d6d7e8d4a04d arm/dsputil_arm.c
--- a/arm/dsputil_arm.c	Wed Jul 22 21:36:50 2009 +0000
+++ b/arm/dsputil_arm.c	Wed Jul 22 22:27:10 2009 +0000
@@ -184,7 +184,7 @@
             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;
diff -r 2ccd77e59b0e -r d6d7e8d4a04d arm/dsputil_neon.c
--- a/arm/dsputil_neon.c	Wed Jul 22 21:36:50 2009 +0000
+++ b/arm/dsputil_neon.c	Wed Jul 22 22:27:10 2009 +0000
@@ -258,7 +258,7 @@
     c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
     c->h264_idct_add8       = ff_h264_idct_add8_neon;
 
-    if (CONFIG_VP3_DECODER || CONFIG_THEORA_DECODER) {
+    if (CONFIG_VP3_DECODER) {
         c->vp3_v_loop_filter = ff_vp3_v_loop_filter_neon;
         c->vp3_h_loop_filter = ff_vp3_h_loop_filter_neon;
     }
diff -r 2ccd77e59b0e -r d6d7e8d4a04d dsputil.c
--- a/dsputil.c	Wed Jul 22 21:36:50 2009 +0000
+++ b/dsputil.c	Wed Jul 22 22:27:10 2009 +0000
@@ -4363,7 +4363,7 @@
             c->idct_add= ff_jref_idct_add;
             c->idct    = j_rev_dct;
             c->idct_permutation_type= FF_LIBMPEG2_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 ) &&
                 avctx->idct_algo==FF_IDCT_VP3){
             c->idct_put= ff_vp3_idct_put_c;
             c->idct_add= ff_vp3_idct_add_c;
@@ -4636,7 +4636,7 @@
         c->h263_v_loop_filter= h263_v_loop_filter_c;
     }
 
-    if (CONFIG_VP3_DECODER || CONFIG_THEORA_DECODER) {
+    if (CONFIG_VP3_DECODER) {
         c->vp3_h_loop_filter= ff_vp3_h_loop_filter_c;
         c->vp3_v_loop_filter= ff_vp3_v_loop_filter_c;
     }
diff -r 2ccd77e59b0e -r d6d7e8d4a04d ppc/dsputil_ppc.c
--- a/ppc/dsputil_ppc.c	Wed Jul 22 21:36:50 2009 +0000
+++ b/ppc/dsputil_ppc.c	Wed Jul 22 22:27:10 2009 +0000
@@ -287,7 +287,7 @@
                 c->idct_put = idct_put_altivec;
                 c->idct_add = idct_add_altivec;
                 c->idct_permutation_type = FF_TRANSPOSE_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) &&
                      avctx->idct_algo==FF_IDCT_VP3){
                 c->idct_put = ff_vp3_idct_put_altivec;
                 c->idct_add = ff_vp3_idct_add_altivec;
diff -r 2ccd77e59b0e -r d6d7e8d4a04d x86/dsputil_mmx.c
--- a/x86/dsputil_mmx.c	Wed Jul 22 21:36:50 2009 +0000
+++ b/x86/dsputil_mmx.c	Wed Jul 22 22:27:10 2009 +0000
@@ -2655,7 +2655,7 @@
                 }
                 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
 #endif
-            }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){
                 if(mm_flags & FF_MM_SSE2){
                     c->idct_put= ff_vp3_idct_put_sse2;
@@ -2777,7 +2777,7 @@
                 c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mmx2;
                 c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mmx2;
 
-                if (CONFIG_VP3_DECODER || CONFIG_THEORA_DECODER) {
+                if (CONFIG_VP3_DECODER) {
                     c->vp3_v_loop_filter= ff_vp3_v_loop_filter_mmx2;
                     c->vp3_h_loop_filter= ff_vp3_h_loop_filter_mmx2;
                 }