generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix null pointer crash in Win32 because esp register is broken"

Browse Source
This commit is contained in:
Johann Koenig 2015-12-09 19:31:12 +00:00 committed by Gerrit Code Review
commit 420b9f5bd3
2 changed files with 4 additions and 4 deletions

4
vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm

@ -124,7 +124,6 @@ SECTION .text
; Store bilin_filter and pw_8 location in stack
GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx
@ -132,6 +131,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back
%else
cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
@ -141,7 +141,6 @@ SECTION .text
; Store bilin_filter and pw_8 location in stack
GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx
@ -149,6 +148,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back
%endif
%else

4
vpx_dsp/x86/subpel_variance_sse2.asm

@ -140,7 +140,6 @@ SECTION .text
;Store bilin_filter and pw_8 location in stack
GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx
@ -148,6 +147,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back
%else
cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
@ -157,7 +157,6 @@ SECTION .text
;Store bilin_filter and pw_8 location in stack
GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx
@ -165,6 +164,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back
%endif
%else