virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

x86: h264: Don't use redzone in AVX h264_deblock on Win64

Browse Source 
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>
This commit is contained in:
Matt Wolenetz 2013-02-15 13:59:40 -08:00 committed by Martin Storsjö
parent a0a1ac0f09
commit 311443f6c7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/x86/h264_deblock.asm
View File

@ -621,7 +621,11 @@ DEBLOCK_LUMA v, 16
%define t5 m11 %define t5 m11
%define mask0 m12 %define mask0 m12
%define mask1p m13 %define mask1p m13
%if WIN64
%define mask1q [rsp]
%else
%define mask1q [rsp-24] %define mask1q [rsp-24]
%endif
%define mpb_0 m14 %define mpb_0 m14
%define mpb_1 m15 %define mpb_1 m15
%else %else
@ -640,7 +644,11 @@ DEBLOCK_LUMA v, 16
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void deblock_v_luma_intra( uint8_t *pix, int stride, int alpha, int beta ) ; 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 cglobal deblock_%1_luma_intra_8, 4,6,16,ARCH_X86_64*0x50-0x50
%endif
lea r4, [r1*4] lea r4, [r1*4]
lea r5, [r1*3] ; 3*stride lea r5, [r1*3] ; 3*stride
dec r2d ; alpha-1 dec r2d ; alpha-1