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 /libswscale | |
| parent | d1d6230ea3dd2c34bcd121f958706f3177f8d8c5 (diff) | |
build: Generalize yasm/nasm-related variable names
None of them are specific to the YASM assembler.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/Makefile | 2 | ||||
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile index b94b14abbb..642ce56484 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -4,6 +4,6 @@ OBJS += x86/rgb2rgb.o \ OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o -YASM-OBJS += x86/input.o \ +X86ASM-OBJS += x86/input.o \ x86/output.o \ x86/scale.o \ diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 3b9c82b2ed..5b8ba1244f 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1945,7 +1945,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui } #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ -#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM +#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_X86ASM void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *unused, int w, uint32_t *unused2); @@ -2538,7 +2538,7 @@ static av_cold void RENAME(rgb2rgb_init)(void) #if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX interleaveBytes = RENAME(interleaveBytes); #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ -#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM +#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_X86ASM deinterleaveBytes = RENAME(deinterleaveBytes); #endif } |