[FFmpeg-cvslog] r19676 - in trunk/libavcodec: cabac.h msmpeg4.c

[reimar]

Author: reimar
Date: Fri Aug 21 11:54:28 2009
New Revision: 19676

Log:
Replace #ifdef PIC checks with the more appropriate HAVE_EBX_AVAILABLE/HAVE_7REGS.

Modified:
   trunk/libavcodec/cabac.h
   trunk/libavcodec/msmpeg4.c

Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	Fri Aug 21 10:46:49 2009	(r19675)
+++ trunk/libavcodec/cabac.h	Fri Aug 21 11:54:28 2009	(r19676)
@@ -637,7 +637,7 @@ static int av_unused get_cabac_bypass(CA
 
 
 static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){
-#if ARCH_X86 && !(defined(PIC) && defined(__GNUC__))
+#if ARCH_X86 && HAVE_EBX_AVAILABLE
     __asm__ volatile(
         "movl "RANGE    "(%1), %%ebx            \n\t"
         "movl "LOW      "(%1), %%eax            \n\t"

Modified: trunk/libavcodec/msmpeg4.c
==============================================================================
--- trunk/libavcodec/msmpeg4.c	Fri Aug 21 10:46:49 2009	(r19675)
+++ trunk/libavcodec/msmpeg4.c	Fri Aug 21 11:54:28 2009	(r19676)
@@ -31,6 +31,7 @@
 #include "dsputil.h"
 #include "mpegvideo.h"
 #include "msmpeg4.h"
+#include "libavutil/x86_cpu.h"
 
 /*
  * You can also call this codec : MPEG4 with a twist !
@@ -647,7 +648,7 @@ static inline int msmpeg4_pred_dc(MpegEn
        necessitate to modify mpegvideo.c. The problem comes from the
        fact they decided to store the quantized DC (which would lead
        to problems if Q could vary !) */
-#if ARCH_X86 && !defined PIC
+#if ARCH_X86 && HAVE_7REGS && HAVE_EBX_AVAILABLE
     __asm__ volatile(
         "movl %3, %%eax         \n\t"
         "shrl $1, %%eax         \n\t"