virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

Replace CONFIG_VORBIS_DECODER #ifdef by if (ENABLE_VORBIS_DECODER).

Browse Source 
Blessed by Luca Barbato on IRC.

Originally committed as revision 10642 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-10-02 12:34:43 +00:00
parent 6c05bab46d
commit eee947487b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/cabac.h
View File

@ -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){ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state]; 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); put_cabac_bypass(c, sign);
} }
} }
#endif /* 0 */
static void refill(CABACContext *c){ static void refill(CABACContext *c){
#if CABAC_BITS == 16 #if CABAC_BITS == 16
@ -270,6 +272,7 @@ static void refill(CABACContext *c){
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#if 0
static void refill2(CABACContext *c){ static void refill2(CABACContext *c){
int i, x; int i, x;
@ -287,6 +290,7 @@ static void refill2(CABACContext *c){
c->low += x<<i; c->low += x<<i;
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#endif
static inline void renorm_cabac_decoder(CABACContext *c){ static inline void renorm_cabac_decoder(CABACContext *c){
while(c->range < 0x100){ while(c->range < 0x100){
@ -860,5 +864,6 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
}else }else
return i; return i;
} }
#endif /* 0 */
#endif /* CABAC_H */ #endif /* CABAC_H */

3
libavcodec/ppc/dsputil_altivec.c
View File

@ -1513,7 +1513,6 @@ void dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx)
c->hadamard8_diff[0] = hadamard8_diff16_altivec; c->hadamard8_diff[0] = hadamard8_diff16_altivec;
c->hadamard8_diff[1] = hadamard8_diff8x8_altivec; c->hadamard8_diff[1] = hadamard8_diff8x8_altivec;
#ifdef CONFIG_VORBIS_DECODER if (ENABLE_VORBIS_DECODER)
c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec; c->vorbis_inverse_coupling = vorbis_inverse_coupling_altivec;
#endif
} }