diff options
| author | Matt Wolenetz <wolenetz@chromium.org> | 2013-02-15 13:59:40 -0800 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-02-21 15:02:16 +0200 |
| commit | 311443f6c7eb230276e320f2d30a5d729cf32b76 (patch) | |
| tree | 30adf1887df755bdef10b01a721861e91c805e99 /libavcodec/x86/h264_deblock.asm | |
| parent | a0a1ac0f091d390cbbb73c90e1b6a4a18cf0f50a (diff) | |
| download | ffmpeg-311443f6c7eb230276e320f2d30a5d729cf32b76.tar.gz | |
x86: h264: Don't use redzone in AVX h264_deblock on Win64
This fixes crashes in chromium on win64 on machines with AVX
(crashes that apparently aren't triggered by fate).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/x86/h264_deblock.asm')
| -rw-r--r-- | libavcodec/x86/h264_deblock.asm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 1f1dbc6a2f..67f9c02464 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -621,7 +621,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 @@ -640,7 +644,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 |