diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2009-02-08 17:44:04 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2009-02-08 17:44:04 +0000 |
| commit | 6166516d1f0df6cc8f96e7685e78ef75541b9698 (patch) | |
| tree | 4217207388108f8ac310c956102da69159a118ff | |
| parent | 74892f7a4ebe94462e61c64cda7d6d3f2a594e3b (diff) | |
| download | ffmpeg-6166516d1f0df6cc8f96e7685e78ef75541b9698.tar.gz | |
re-enable mid_pred asm on x86_64. (broke in r16681)
Originally committed as revision 17058 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mathops.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mathops.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 1365903913..880e94671f 100644 --- 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 6bd4b17705..a66c601878 100644 --- 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 */ |