diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
| commit | 3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4 (patch) | |
| tree | 577f31caa05926e2a6ba6daf16397a9a2768f09d /libavcodec | |
| parent | 9b72041f805ed71a88182449984e3975fc76ceca (diff) | |
| parent | 246154a9aff222b80befd65faf97494ce9113306 (diff) | |
| download | ffmpeg-3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
log: Include io.h on windows
lavr: x86: merge some branches
x86: cpu: whitespace (mostly) cosmetics
x86: fft: win64: fix stack alignment for memcpy() call
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 |