aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wolenetz <wolenetz@chromium.org>2013-02-15 13:59:40 -0800
committerMichael Niedermayer <michaelni@gmx.at>2013-02-23 01:47:05 +0100
commit5bed920971c555da67965918f440e516294cd44d (patch)
treebcfa475fa19af67fa2bfe2df10b1356bc62b9feb
parent705e89d75fdea01a2ae1b89cf8a93533ea9b2050 (diff)
downloadffmpeg-5bed920971c555da67965918f440e516294cd44d.tar.gz
Fix Win64 AVX h264_deblock by not using redzone on Win64n1.1.3
Thanks-to: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 82a4a4e7caa96cea9aa2185c4c3110a5e9fde7c2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/h264_deblock.asm8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm
index 8ac38fcaa8..5f2374d3ea 100644
--- a/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@ -625,7 +625,11 @@ DEBLOCK_LUMA v, 16
%define t5 m11
%define mask0 m12
%define mask1p m13
+%if WIN64
+ %define mask1q [rsp]
+%else
%define mask1q [rsp-24]
+%endif
%define mpb_0 m14
%define mpb_1 m15
%else
@@ -644,7 +648,11 @@ DEBLOCK_LUMA v, 16
;-----------------------------------------------------------------------------
; void deblock_v_luma_intra( uint8_t *pix, int stride, int alpha, int beta )
;-----------------------------------------------------------------------------
+%if WIN64
+cglobal deblock_%1_luma_intra_8, 4,6,16,0x10
+%else
cglobal deblock_%1_luma_intra_8, 4,6,16,ARCH_X86_64*0x50-0x50
+%endif
lea r4, [r1*4]
lea r5, [r1*3] ; 3*stride
dec r2d ; alpha-1