xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-12 15:28:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'

Browse Source 
* 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>
This commit is contained in:
Hendrik Leppkes 2015-08-02 12:31:39 +02:00
commit 1ce298dac5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/x86/dct32.asm
View File

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

4
libavcodec/x86/dct_init.c
View File

@ -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))