diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 13:31:39 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 13:31:39 +0300 |
| commit | 1ce298dac51cb948a7170ed28e8290530cf150f4 (patch) | |
| tree | b6440ff8a032144c67b8a195ba5e711f38f418ae /libavcodec/x86/dct32.asm | |
| 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/x86/dct32.asm')
| -rw-r--r-- | libavcodec/x86/dct32.asm | 1 |
1 files changed, 1 insertions, 0 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 |