# HG changeset patch
# User diego
# Date 1191328483 0
# Node ID af20477e9994773f6ba7947ca560f2a7a10e154f
# Parent  3260fa3c89eb70734f5d9369ab01e182a3141ed3
Replace CONFIG_VORBIS_DECODER #ifdef by if (ENABLE_VORBIS_DECODER).
Blessed by Luca Barbato on IRC.

diff -r 3260fa3c89eb -r af20477e9994 cabac.h
--- a/cabac.h	Tue Oct 02 12:16:33 2007 +0000
+++ b/cabac.h	Tue Oct 02 12:34:43 2007 +0000
@@ -90,6 +90,7 @@
     }
 }
 
+#if 0
 static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
     int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
 
@@ -259,6 +260,7 @@
             put_cabac_bypass(c, sign);
     }
 }
+#endif /* 0 */
 
 static void refill(CABACContext *c){
 #if CABAC_BITS == 16
@@ -270,6 +272,7 @@
     c->bytestream+= CABAC_BITS/8;
 }
 
+#if 0
 static void refill2(CABACContext *c){
     int i, x;
 
@@ -287,6 +290,7 @@
     c->low += x<<i;
     c->bytestream+= CABAC_BITS/8;
 }
+#endif
 
 static inline void renorm_cabac_decoder(CABACContext *c){
     while(c->range < 0x100){
@@ -860,5 +864,6 @@
     }else
         return i;
 }
+#endif /* 0 */
 
 #endif /* CABAC_H */
diff -r 3260fa3c89eb -r af20477e9994 ppc/dsputil_altivec.c
--- a/ppc/dsputil_altivec.c	Tue Oct 02 12:16:33 2007 +0000
+++ b/ppc/dsputil_altivec.c	Tue Oct 02 12:34:43 2007 +0000
@@ -1513,7 +1513,6 @@
 
     c->hadamard8_diff[0] = hadamard8_diff16_altivec;
     c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
-#ifdef CONFIG_VORBIS_DECODER
+    if (ENABLE_VORBIS_DECODER)
     c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec;
-#endif
 }