diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-06-26 15:56:01 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-26 15:56:01 +0200 |
| commit | d4c45b8adfbd57853ef5eafdbf46adc1bbd7654d (patch) | |
| tree | c8adc2753e1719ad37787ffdab2d4fe6952992ff /libavcodec/x86 | |
| parent | 91765594dd4310f9307362f0741fea3b1c902619 (diff) | |
| download | ffmpeg-d4c45b8adfbd57853ef5eafdbf46adc1bbd7654d.tar.gz | |
Revert "Revert "x86: fft: win64: fix stack alignment for memcpy() call""
This reverts commit f767658414fc85dea4006cb82969b6a925fdd380.
The bug it introduces has been fixed.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/fft_mmx.asm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm index 7d046df18e..f1b7f2a515 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 |