diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-11-01 17:01:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-11-01 17:01:33 +0000 |
| commit | 419b878494346c2f9d81f23d7a75cbe03eb5dab0 (patch) | |
| tree | 2d410c6064c50c43ebb2b69444a7ddb2f730034a /libavcodec/cabac.h | |
| parent | 6c02f9e7ee00d6a08c75a793546ea2e89b502a24 (diff) | |
| download | ffmpeg-419b878494346c2f9d81f23d7a75cbe03eb5dab0.tar.gz | |
Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits.
Originally committed as revision 6852 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 9593789e10..8b2e87b3c9 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -379,7 +379,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state #define BYTE "16" #define BYTEEND "20" #endif -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) int bit; #ifndef BRANCHLESS_CABAC_DECODER @@ -535,7 +535,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state ); bit&=1; #endif /* BRANCHLESS_CABAC_DECODER */ -#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#else /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */ int s = *state; int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; int bit, lps_mask attribute_unused; @@ -574,7 +574,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state if(!(c->low & CABAC_MASK)) refill2(c); #endif /* BRANCHLESS_CABAC_DECODER */ -#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */ +#endif /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */ return bit; } @@ -683,7 +683,7 @@ static 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 (cant be done yet as that would make optimization work hard) -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) +#if defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) 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(PIC) && defined(__GNUC__)) */ +#endif /* defined(ARCH_X86_32) && !(defined(PIC) && defined(__GNUC__)) */ /** * |