diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 17:18:33 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 23:00:29 +0300 |
| commit | fd502f4f5fe8d2f241102ca9a529aa7f88209c22 (patch) | |
| tree | 145739652cff190593860ec2e371d3df148e7027 /libavutil | |
| parent | 664ac7c5e2e9b2b001be6124b90b398861c773af (diff) | |
build: Generalize yasm/nasm-related variable names
None of them are specific to the YASM assembler.
(Cherry-picked from libav commit 39e208f4d4756367c7cd2d581847e0c1b8a429c1)
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/x86/cpu.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile index 2b0ba16c94..5f5242b5bd 100644 --- a/libavutil/x86/Makefile +++ b/libavutil/x86/Makefile @@ -8,11 +8,11 @@ OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \ EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o -YASM-OBJS += x86/cpuid.o \ +X86ASM-OBJS += x86/cpuid.o \ $(EMMS_OBJS__yes_) \ x86/fixed_dsp.o \ x86/float_dsp.o \ x86/imgutils.o \ x86/lls.o \ -YASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \ +X86ASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \ diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 1b80847d19..3800a11ad8 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 |