[FFmpeg-cvslog] x86: fft: win64: fix stack alignment for memcpy() call
Mans Rullgard
git at videolan.org
Tue Jun 26 01:30:14 CEST 2012
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jun 25 14:33:24 2012 +0100| [8725da49a2090de05b4b2d05e33727f45cb9d970] | committer: Mans Rullgard
x86: fft: win64: fix stack alignment for memcpy() call
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8725da49a2090de05b4b2d05e33727f45cb9d970
---
libavcodec/x86/fft_mmx.asm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm
index 1cacfb7..5143611 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
More information about the ffmpeg-cvslog
mailing list