# HG changeset patch
# User reimar
# Date 1250848468 0
# Node ID 6ac0d4957d3502e73149c5d8eb8979d62c508cd6
# Parent  68f03567b8265eb1bba9463eefa23644ba6b3f7e
Replace #ifdef PIC checks with the more appropriate HAVE_EBX_AVAILABLE/HAVE_7REGS.

diff -r 68f03567b826 -r 6ac0d4957d35 cabac.h
--- a/cabac.h	Fri Aug 21 08:46:49 2009 +0000
+++ b/cabac.h	Fri Aug 21 09:54:28 2009 +0000
@@ -637,7 +637,7 @@
 
 
 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"
diff -r 68f03567b826 -r 6ac0d4957d35 msmpeg4.c
--- a/msmpeg4.c	Fri Aug 21 08:46:49 2009 +0000
+++ b/msmpeg4.c	Fri Aug 21 09:54:28 2009 +0000
@@ -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 @@
        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"