[FFmpeg-cvslog] Revert "x86: fft: win64: fix stack alignment for memcpy() call"
Nicolas George
git at videolan.org
Tue Jun 26 13:07:06 CEST 2012
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Jun 26 12:59:48 2012 +0200| [f767658414fc85dea4006cb82969b6a925fdd380] | committer: Nicolas George
Revert "x86: fft: win64: fix stack alignment for memcpy() call"
This reverts commit 8725da49a2090de05b4b2d05e33727f45cb9d970.
Necerrary to revert 82992604706144910f4a2f875d48cfc66c1b70d7.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f767658414fc85dea4006cb82969b6a925fdd380
---
libavcodec/x86/fft_mmx.asm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm
index f1b7f2a..7d046df 100644
--- a/libavcodec/x86/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
@@ -641,21 +641,19 @@ 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
- RET
+%endif
+ REP_RET
%endif
cglobal imdct_calc, 3,5,3
More information about the ffmpeg-cvslog
mailing list