From 6d408495b59547c6c07830d2095144586dc13a5b Mon Sep 17 00:00:00 2001 From: James Almer Date: Sun, 8 Jun 2014 19:39:21 -0300 Subject: [PATCH] x86/dct32: don't build ff_dct32_float_sse on x86_64 There's an SSE2 version already, and technically the SSE version on x86_64 was wrong (using pshufd and pshuflw, SSE2 instructions). Signed-off-by: James Almer Signed-off-by: Michael Niedermayer --- libavcodec/x86/dct32.asm | 2 ++ libavcodec/x86/dct_init.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm index 6fd5ba350d..c70f6c9c49 100644 --- a/libavcodec/x86/dct32.asm +++ b/libavcodec/x86/dct32.asm @@ -484,7 +484,9 @@ 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 85e2d0c3e6..fd6ef4553f 100644 --- a/libavcodec/x86/dct_init.c +++ b/libavcodec/x86/dct_init.c @@ -30,7 +30,7 @@ av_cold void ff_dct_init_x86(DCTContext *s) { int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_SSE(cpu_flags)) + if (EXTERNAL_SSE(cpu_flags) && ARCH_X86_32) s->dct32 = ff_dct32_float_sse; if (EXTERNAL_SSE2(cpu_flags)) s->dct32 = ff_dct32_float_sse2;