diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-10-02 12:34:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-10-02 12:34:43 +0000 |
| commit | eee947487b056749fec80e085021ed7d3716b262 (patch) | |
| tree | f2495ababda3bfe6d4496e777c4d290052bade24 | |
| parent | 6c05bab46d913fa5f5383d4702a1e6ba383138ff (diff) | |
| download | ffmpeg-eee947487b056749fec80e085021ed7d3716b262.tar.gz | |
Replace CONFIG_VORBIS_DECODER #ifdef by if (ENABLE_VORBIS_DECODER).
Blessed by Luca Barbato on IRC.
Originally committed as revision 10642 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/cabac.h | 5 | ||||
| -rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index bb682d9498..637a1c6164 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -90,6 +90,7 @@ static inline void renorm_cabac_encoder(CABACContext *c){ } } +#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 @@ static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int put_cabac_bypass(c, sign); } } +#endif /* 0 */ static void refill(CABACContext *c){ #if CABAC_BITS == 16 @@ -270,6 +272,7 @@ static void refill(CABACContext *c){ c->bytestream+= CABAC_BITS/8; } +#if 0 static void refill2(CABACContext *c){ int i, x; @@ -287,6 +290,7 @@ static void refill2(CABACContext *c){ 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 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe }else return i; } +#endif /* 0 */ #endif /* CABAC_H */ diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index da243d989f..91c6741c2f 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -1513,7 +1513,6 @@ void dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx) 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 } |