diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:34:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:35:49 +0200 |
| commit | 1a2ff628593c6162f72364d25aeccc66663455ea (patch) | |
| tree | 7989d5f0fea86071311a82229a480478084173d3 | |
| parent | a2faa3d858099c5221430726697ed4a3ba2105f5 (diff) | |
| parent | 570d4b21863b6254d6bbca9c528bede471bb4478 (diff) | |
| download | ffmpeg-1a2ff628593c6162f72364d25aeccc66663455ea.tar.gz | |
Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'
* commit '570d4b21863b6254d6bbca9c528bede471bb4478':
x86: h264: Don't keep data in the redzone across function calls on 64 bit unix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/h264_deblock.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index e5cc442943..f3a95a752e 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -827,10 +827,10 @@ cglobal deblock_v_chroma_8, 5,6 ; int8_t *tc0) ;----------------------------------------------------------------------------- cglobal deblock_h_chroma_8, 5,7 -%if UNIX64 - %define buf0 [rsp-24] - %define buf1 [rsp-16] -%elif WIN64 +%if ARCH_X86_64 + ; This could use the red zone on 64 bit unix to avoid the stack pointer + ; readjustment, but valgrind assumes the red zone is clobbered on + ; function calls and returns. sub rsp, 16 %define buf0 [rsp] %define buf1 [rsp+8] @@ -850,7 +850,7 @@ cglobal deblock_h_chroma_8, 5,7 movq m0, buf0 movq m3, buf1 TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) -%if WIN64 +%if ARCH_X86_64 add rsp, 16 %endif RET |