summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-06-25 14:33:24 +0100
committerMans Rullgard <mans@mansr.com>2012-06-25 15:10:39 +0100
commit8725da49a2090de05b4b2d05e33727f45cb9d970 (patch)
treeb7a3d871dbd9f87d32be5f6621130210f1634c1f /libavcodec
parentdc5385806339f90b4eb074d9002205ebb4010cc2 (diff)
x86: fft: win64: fix stack alignment for memcpy() call
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/fft_mmx.asm16
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm
index 1cacfb7bd6..5143611533 100644
--- a/libavcodec/x86/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
@@ -640,19 +640,21 @@ cglobal fft_permute, 2,7,1
%if ARCH_X86_64
mov r0, r1
mov r1, r5
+%endif
+%if WIN64
+ sub rsp, 8
+ call memcpy
+ add rsp, 8
+ RET
+%elif ARCH_X86_64
+ jmp memcpy
%else
push r2
push r5
push r1
-%endif
-%if ARCH_X86_64 && WIN64 == 0
- jmp memcpy
-%else
call memcpy
-%if ARCH_X86_32
add esp, 12
-%endif
- REP_RET
+ RET
%endif
cglobal imdct_calc, 3,5,3