Commit 420b9f5b authored by Johann Koenig's avatar Johann Koenig Committed by Gerrit Code Review

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

parents 74c67e3d 5fc96887
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment