diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-14 09:59:57 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-14 09:59:57 +0000 |
| commit | f9be0cb800a0dee4a5ace5143ada201b7e6cd85d (patch) | |
| tree | a6e4591c55efe2d14fcb93d99ba10415cd2dd3b9 | |
| parent | 26c1b3bee90aff139e4d3a4cfea9dce8be975d3c (diff) | |
| download | ffmpeg-f9be0cb800a0dee4a5ace5143ada201b7e6cd85d.tar.gz | |
Update preprocessor directive comments to take recent changes to this file
into account.
Originally committed as revision 8731 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/cabac.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index c96eb0b961..d0771202c2 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -532,7 +532,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */ int s = *state; int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; int bit, lps_mask attribute_unused; @@ -571,7 +571,7 @@ static int av_always_inline 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(PIC) && defined(__GNUC__)) */ +#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */ return bit; } @@ -786,7 +786,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe ); return coeff_count; } -#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */ /** * |