diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:31:39 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:31:39 +0200 |
| commit | 1ce298dac51cb948a7170ed28e8290530cf150f4 (patch) | |
| tree | b6440ff8a032144c67b8a195ba5e711f38f418ae /libavcodec | |
| parent | b3e5d59537cbd375ca508fe2dfca30bcd2d201d3 (diff) | |
| parent | ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db (diff) | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dct32.asm | 1 | ||||
| -rw-r--r-- | libavcodec/x86/dct_init.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/x86/dct32.asm b/libavcodec/x86/dct32.asm index c70f6c9c49..3e37812f1a 100644 --- a/libavcodec/x86/dct32.asm +++ b/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 diff --git a/libavcodec/x86/dct_init.c b/libavcodec/x86/dct_init.c index daf2bb4e5d..c31ef92238 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 && 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)) |