diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-15 21:19:13 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-15 21:19:13 +0000 |
| commit | c8f9ef613ea47e1653fefaccc7d1cf79ab9c72b0 (patch) | |
| tree | a9ea55843732c4f6a39e9e87619db0d5dc592806 /libavcodec/cabac.h | |
| parent | 119614c0aa19e5c0a83489b897990941e7cfd0a1 (diff) | |
| download | ffmpeg-c8f9ef613ea47e1653fefaccc7d1cf79ab9c72b0.tar.gz | |
CONFIG_7REGS -> HAVE_7REGS
Originally committed as revision 10121 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cabac.h')
| -rw-r--r-- | libavcodec/cabac.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index 53a2fdfc5e..31cff9148c 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -379,7 +379,7 @@ static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const st #define BYTE "16" #define BYTEEND "20" #endif -#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) +#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) int bit; #ifndef BRANCHLESS_CABAC_DECODER @@ -535,7 +535,7 @@ static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const st ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#else /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ int s = *state; int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; int bit, lps_mask av_unused; @@ -574,7 +574,7 @@ static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const st if(!(c->low & CABAC_MASK)) refill2(c); #endif /* BRANCHLESS_CABAC_DECODER */ -#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ return bit; } @@ -683,7 +683,7 @@ static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) //FIXME use some macros to avoid duplicatin get_cabac (cannot be done yet as that would make optimization work hard) -#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) +#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ void *end= significant_coeff_ctx_base + max_coeff - 1; int minusstart= -(int)significant_coeff_ctx_base; @@ -789,7 +789,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe ); return coeff_count; } -#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ +#endif /* defined(ARCH_X86) && && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ /** * |