From 4d777eedfd339e431d73a3787cc9587775f1ba9c Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Thu, 26 Jul 2012 22:16:37 -0700
Subject: vp3: don't compile mmx IDCT functions on x86-64.

64-bit CPUs always have SSE2, and a SSE2 version exists, thus the MMX
version will never be used.
---
 libavcodec/x86/vp3dsp.asm    | 3 +++
 libavcodec/x86/vp3dsp_init.c | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'libavcodec')

diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm
index 5877520..7a88892 100644
--- a/libavcodec/x86/vp3dsp.asm
+++ b/libavcodec/x86/vp3dsp.asm
@@ -607,8 +607,11 @@ cglobal vp3_idct_add, 3, 4, 9
     RET
 %endmacro
 
+%if ARCH_X86_32
 INIT_MMX mmx
 vp3_idct_funcs
+%endif
+
 INIT_XMM sse2
 vp3_idct_funcs
 
diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c
index cd8e206..704d4a6 100644
--- a/libavcodec/x86/vp3dsp_init.c
+++ b/libavcodec/x86/vp3dsp_init.c
@@ -41,11 +41,13 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
 #if HAVE_YASM
     int cpuflags = av_get_cpu_flags();
 
+#if ARCH_X86_32
     if (HAVE_MMX && cpuflags & AV_CPU_FLAG_MMX) {
         c->idct_put  = ff_vp3_idct_put_mmx;
         c->idct_add  = ff_vp3_idct_add_mmx;
         c->idct_perm = FF_PARTTRANS_IDCT_PERM;
     }
+#endif
 
     if (HAVE_MMX2 && cpuflags & AV_CPU_FLAG_MMX2) {
         c->idct_dc_add = ff_vp3_idct_dc_add_mmx2;
-- 
cgit v1.1