fix some name mangling issues introduced by the merge

diff --git a/common/x86/dct-a.asm b/common/x86/dct-a.asm
index 4d3efcb587a5bc460de1160896eedaf8086cb422..a23bf7612779fb75bb909099f7161a04990e7007 100644 (file)
--- a/common/x86/dct-a.asm
+++ b/common/x86/dct-a.asm
@@ -258,11 +258,11 @@ cglobal %1, 2,2,1
     jmp  %2
 %endmacro
 
-SUB_NxN_DCT  x264_sub8x8_dct_mmx,    x264_sub4x4_dct_mmx.skip_prologue,  32, 4, 0,  4
-ADD_NxN_IDCT x264_add8x8_idct_mmx,   x264_add4x4_idct_mmx.skip_prologue, 32, 4, 0,  4
+SUB_NxN_DCT  x264_sub8x8_dct_mmx,    x264_sub4x4_dct_mmx  %+ .skip_prologue, 32, 4, 0,  4
+ADD_NxN_IDCT x264_add8x8_idct_mmx,   x264_add4x4_idct_mmx %+ .skip_prologue, 32, 4, 0,  4
 
-SUB_NxN_DCT  x264_sub16x16_dct_mmx,  x264_sub8x8_dct_mmx.skip_prologue,  32, 4, 4, 12
-ADD_NxN_IDCT x264_add16x16_idct_mmx, x264_add8x8_idct_mmx.skip_prologue, 32, 4, 4, 12
+SUB_NxN_DCT  x264_sub16x16_dct_mmx,  x264_sub8x8_dct_mmx  %+ .skip_prologue, 32, 4, 4, 12
+ADD_NxN_IDCT x264_add16x16_idct_mmx, x264_add8x8_idct_mmx %+ .skip_prologue, 32, 4, 4, 12
 
 %ifdef ARCH_X86_64
 cextern x264_sub8x8_dct8_sse2

diff --git a/common/x86/pixel-a.asm b/common/x86/pixel-a.asm
index 93d2b7da601603690488baf77d6bd66f711f45c4..0d2eab342738afcb7747e1ca0e1bcf83d5a142d4 100644 (file)
--- a/common/x86/pixel-a.asm
+++ b/common/x86/pixel-a.asm
@@ -1625,7 +1625,8 @@ ADS_SSE2 ssse3
 ;     return nmv;
 ; }
 %ifdef ARCH_X86_64
-cglobal x264_pixel_ads_mvs
+ALIGN 16
+x264_pixel_ads_mvs:
     ; mvs = r4
     ; masks = rsp
     ; width = r5
@@ -1666,7 +1667,8 @@ cglobal x264_pixel_ads_mvs
     ret
 
 %else
-cglobal x264_pixel_ads_mvs
+ALIGN 16
+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