diff options
| author | Bernhard Rosenkränzer <bero@arklinux.org> | 2006-10-19 20:24:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-19 20:24:33 +0000 |
| commit | ba9fb5da3afd74ab5c0c97ecd7a1fdac006f8bd4 (patch) | |
| tree | 41d387509850b1606ad9a2676b08a8e60d62467e | |
| parent | d72bc3238963d76ecc322ba223a2bde719a59968 (diff) | |
| download | ffmpeg-ba9fb5da3afd74ab5c0c97ecd7a1fdac006f8bd4.tar.gz | |
Fix PIC compilation, some defines were under #ifdef !PIC but used
in the PIC case nevertheless.
patch by Bernhard Rosenkranzer, bero arklinux org
Originally committed as revision 6738 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 403c0f4725..826e281ca6 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -363,14 +363,14 @@ static inline void renorm_cabac_decoder_once(CABACContext *c){ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state){ //FIXME gcc generates duplicate load/stores for c->low and c->range -#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) - int bit; - #define LOW "0" #define RANGE "4" #define BYTESTART "12" #define BYTE "16" #define BYTEEND "20" +#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) + int bit; + #ifndef BRANCHLESS_CABAC_DECODER asm volatile( "movzbl (%1), %0 \n\t" |