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

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 403c0f4..826e281 100644 (file)
--- 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"