Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'

* commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db':
  x86: dct: Disable dct32_float_sse on x86-64

Conflicts:
	libavcodec/x86/dct32.asm
	libavcodec/x86/dct_init.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavcodec/x86/dct32.asm

@@ -488,5 +488,6 @@ cglobal dct32_float, 2, 3, 16, out, in, tmp
 INIT_XMM sse
 DCT32_FUNC
 %endif
+
 INIT_XMM sse2
 DCT32_FUNC

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 && EXTERNAL_SSE(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))