[FFmpeg-cvslog] Revert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Jun 26 15:56:01 2012 +0200| [d4c45b8adfbd57853ef5eafdbf46adc1bbd7654d] | committer: Nicolas George

Revert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""

This reverts commit f767658414fc85dea4006cb82969b6a925fdd380.

The bug it introduces has been fixed.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4c45b8adfbd57853ef5eafdbf46adc1bbd7654d
---

 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 7d046df..f1b7f2a 100644
--- a/libavcodec/x86/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
@@ -641,19 +641,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