Commit c82674fe authored by Loren Merritt's avatar Loren Merritt

fix some name mangling issues introduced by the merge

parent 20b4106b
......@@ -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
......
......@@ -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
......
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