From: Loren Merritt Date: Tue, 18 Mar 2008 18:34:10 +0000 (-0600) Subject: fix name mangling again. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73b3fd48e592de96c05bdfe0cf7144c0da6ac650;p=libx264 fix name mangling again. apparently it's not just a convention, dll build fails if you try to export a non-prefixed name. --- diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm index 84e2cf1b..b4593d66 100644 --- a/common/x86/pixel-a.asm +++ b/common/x86/pixel-a.asm @@ -1393,7 +1393,7 @@ cglobal x264_pixel_ssim_end4_sse2, 3,3 add t0, 4*%1 sub r0d, 4*%1 jg .loop - jmp x264_pixel_ads_mvs + jmp ads_mvs %endmacro %define ABS1 ABS1_MMX @@ -1623,17 +1623,16 @@ ADS_SSE2 ssse3 ; } ; return nmv; ; } -global x264_pixel_ads_mvs -ALIGN 16 +cglobal x264_pixel_ads_mvs +ads_mvs: + xor eax, eax + xor esi, esi %ifdef ARCH_X86_64 -x264_pixel_ads_mvs: ; mvs = r4 ; masks = rsp ; width = r5 ; clear last block in case width isn't divisible by 8. (assume divisible by 4, so clearing 4 bytes is enough.) mov dword [rsp+r5], 0 - xor eax, eax - xor esi, esi jmp .loopi .loopi0: add esi, 8 @@ -1667,14 +1666,11 @@ x264_pixel_ads_mvs: ret %else -x264_pixel_ads_mvs: ; no PROLOGUE, inherit from x264_pixel_ads1 mov ebx, [ebp+stack_offset+20] ; mvs mov edi, [ebp+stack_offset+24] ; width mov dword [esp+edi], 0 push ebp - xor eax, eax - xor esi, esi jmp .loopi .loopi0: add esi, 8