diff options
| -rw-r--r-- | libavutil/x86/x86inc.asm | 10 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 2 | ||||
| -rw-r--r-- | libswscale/x86/input.asm | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 2617cdf273..4d8d0db2c7 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -34,8 +34,8 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . -%ifndef program_name - %define program_name x264 +%ifndef private_prefix + %define private_prefix x264 %endif %define WIN64 0 @@ -631,7 +631,7 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 %endmacro %macro cglobal_internal 1-2+ %ifndef cglobaled_%1 - %xdefine %1 mangle(program_name %+ _ %+ %1) + %xdefine %1 mangle(private_prefix %+ _ %+ %1) %xdefine %1.skip_prologue %1 %+ .skip_prologue CAT_XDEFINE cglobaled_, %1, 1 %endif @@ -655,7 +655,7 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 %endmacro %macro cextern 1 - %xdefine %1 mangle(program_name %+ _ %+ %1) + %xdefine %1 mangle(private_prefix %+ _ %+ %1) CAT_XDEFINE cglobaled_, %1, 1 extern %1 %endmacro @@ -668,7 +668,7 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 %endmacro %macro const 2+ - %xdefine %1 mangle(program_name %+ _ %+ %1) + %xdefine %1 mangle(private_prefix %+ _ %+ %1) global %1 %1: %2 %endmacro diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 551c40a4b5..40738c9c4c 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -23,7 +23,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%define program_name ff +%define private_prefix ff %define cpuflags_mmxext cpuflags_mmx2 %include "libavutil/x86/x86inc.asm" diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index a8d5a5a187..6f5677e1fd 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -98,7 +98,7 @@ cglobal %2 %+ 24ToY, 3, 3, %1, dst, src, w %define coeff2 [%2_Ycoeff_3x56] %endif ; x86-32/64 && mmsize == 8/16 %if (ARCH_X86_64 || mmsize == 8) && %0 == 3 - jmp mangle(program_name %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body %else ; (ARCH_X86_64 && %0 == 3) || mmsize == 8 .body: %if cpuflag(ssse3) @@ -188,7 +188,7 @@ cglobal %2 %+ 24ToUV, 3, 4, %1, dstU, dstV, src, w %define coeffV2 [%2_Vcoeff_3x56] %endif ; x86-32/64 %if ARCH_X86_64 && %0 == 3 - jmp mangle(program_name %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body %else ; ARCH_X86_64 && %0 == 3 .body: %if cpuflag(ssse3) @@ -315,7 +315,7 @@ cglobal %2%3%4%5 %+ ToY, 3, 3, %1, dst, src, w mova m5, [rgba_Ycoeff_%2%4] mova m6, [rgba_Ycoeff_%3%5] %if %0 == 6 - jmp mangle(program_name %+ _ %+ %6 %+ ToY %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %6 %+ ToY %+ SUFFIX).body %else ; %0 == 6 .body: %if ARCH_X86_64 @@ -371,7 +371,7 @@ cglobal %2%3%4%5 %+ ToUV, 3, 4, %1, dstU, dstV, src, w %define coeffV2 [rgba_Vcoeff_%3%5] %endif ; x86-64/32 %if ARCH_X86_64 && %0 == 6 - jmp mangle(program_name %+ _ %+ %6 %+ ToUV %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %6 %+ ToUV %+ SUFFIX).body %else ; ARCH_X86_64 && %0 == 6 .body: %if ARCH_X86_64 |