[FFmpeg-cvslog] x86: dct: Disable dct32_float_sse on x86-64

[Henrik Gramner]

ffmpeg | branch: master | Henrik Gramner <henrik at gramner.com> | Sat Aug  1 17:12:48 2015 +0200| [ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db] | committer: Anton Khirnov

x86: dct: Disable dct32_float_sse on x86-64

There is an SSE2 implementation so the SSE version is never used. The "SSE"
version also happens to contain SSE2 instructions on x86-64.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db
---

 libavcodec/x86/dct32.asm  |    3 +++
 libavcodec/x86/dct_init.c |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm
index 9c147b9..0879c68 100644
--- a/libavcodec/x86/dct32.asm
+++ b/libavcodec/x86/dct32.asm
@@ -482,7 +482,10 @@ cglobal dct32_float, 2, 3, 16, out, in, tmp
 %endif
 %endmacro
 
+%if ARCH_X86_32
 INIT_XMM sse
 DCT32_FUNC
+%endif
+
 INIT_XMM sse2
 DCT32_FUNC
diff --git a/libavcodec/x86/dct_init.c b/libavcodec/x86/dct_init.c
index ca9fbc7..b2e43a9 100644
--- a/libavcodec/x86/dct_init.c
+++ b/libavcodec/x86/dct_init.c
@@ -30,8 +30,10 @@ av_cold void ff_dct_init_x86(DCTContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
+#if ARCH_X86_32
     if (EXTERNAL_SSE(cpu_flags))
         s->dct32 = ff_dct32_float_sse;
+#endif
     if (EXTERNAL_SSE2(cpu_flags))
         s->dct32 = ff_dct32_float_sse2;
     if (EXTERNAL_AVX_FAST(cpu_flags))