[x264-devel] commit: fix name mangling again. (Loren Merritt )

git version control git at videolan.org
Wed Mar 19 02:03:49 CET 2008


x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Tue Mar 18 12:34:10 2008 -0600| [4c02055a87b79cf00da75456e8666d60fd1785d3]

fix name mangling again.
apparently it's not just a convention, dll build fails if you try to export a non-prefixed name.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=4c02055a87b79cf00da75456e8666d60fd1785d3
---

 common/x86/pixel-a.asm |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm
index 84e2cf1..b4593d6 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



More information about the x264-devel mailing list