re-enable mid_pred asm on x86_64. (broke in r16681)

Originally committed as revision 17058 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 1365903..880e946 100644 (file)
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -24,7 +24,7 @@
 
 #include "libavutil/common.h"
 
-#if   ARCH_X86_32
+#if   ARCH_X86
 
 #include "x86/mathops.h"
 

diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
index 6bd4b17..a66c601 100644 (file)
--- a/libavcodec/x86/mathops.h
+++ b/libavcodec/x86/mathops.h
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "libavutil/common.h"
 
+#if ARCH_X86_32
 #define MULL(ra, rb, shift) \
         ({ int rt, dummy; __asm__ (\
             "imull %3               \n\t"\
@@ -42,6 +43,7 @@
     ({ int64_t rt;\
      __asm__ ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\
      rt; })
+#endif
 
 #if HAVE_CMOV
 /* median of 3 */