[Ffmpeg-cvslog] r6738 - trunk/libavcodec/cabac.h

diego subversion
Thu Oct 19 22:24:33 CEST 2006


Author: diego
Date: Thu Oct 19 22:24:33 2006
New Revision: 6738

Modified:
   trunk/libavcodec/cabac.h

Log:
Fix PIC compilation, some defines were under #ifdef !PIC but used
in the PIC case nevertheless.
patch by Bernhard Rosenkranzer, bero arklinux org


Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	(original)
+++ trunk/libavcodec/cabac.h	Thu Oct 19 22:24:33 2006
@@ -363,14 +363,14 @@
 
 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"




More information about the ffmpeg-cvslog mailing list