diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 16:18:33 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-03-01 10:18:15 +0100 |
| commit | 39e208f4d4756367c7cd2d581847e0c1b8a429c1 (patch) | |
| tree | 6c3b1695b47827dc2224fdf75b0c0be781579847 /libavutil/x86 | |
| parent | d1d6230ea3dd2c34bcd121f958706f3177f8d8c5 (diff) | |
| download | ffmpeg-39e208f4d4756367c7cd2d581847e0c1b8a429c1.tar.gz | |
build: Generalize yasm/nasm-related variable names
None of them are specific to the YASM assembler.
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/Makefile | 10 | ||||
| -rw-r--r-- | libavutil/x86/cpu.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile index ffee43b1ad..b619478610 100644 --- a/libavutil/x86/Makefile +++ b/libavutil/x86/Makefile @@ -3,8 +3,8 @@ OBJS += x86/cpu.o \ x86/imgutils_init.o \ x86/lls_init.o \ -YASM-OBJS += x86/cpuid.o \ - x86/emms.o \ - x86/float_dsp.o \ - x86/imgutils.o \ - x86/lls.o \ +X86ASM-OBJS += x86/cpuid.o \ + x86/emms.o \ + x86/float_dsp.o \ + x86/imgutils.o \ + x86/lls.o \ diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 3b085e71f5..7c50fe38e2 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -28,7 +28,7 @@ #include "libavutil/cpu.h" #include "libavutil/cpu_internal.h" -#if HAVE_YASM +#if HAVE_X86ASM #define cpuid(index, eax, ebx, ecx, edx) \ ff_cpu_cpuid(index, &eax, &ebx, &ecx, &edx) @@ -66,7 +66,7 @@ #define cpuid_test() 1 -#elif HAVE_YASM +#elif HAVE_X86ASM #define cpuid_test ff_cpu_cpuid_test |