diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-08 14:18:33 +0000 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 17:00:29 -0300 |
| commit | fd502f4f5fe8d2f241102ca9a529aa7f88209c22 (patch) | |
| tree | 145739652cff190593860ec2e371d3df148e7027 /libswscale/x86 | |
| parent | 664ac7c5e2e9b2b001be6124b90b398861c773af (diff) | |
| download | ffmpeg-streaming-fd502f4f5fe8d2f241102ca9a529aa7f88209c22.zip ffmpeg-streaming-fd502f4f5fe8d2f241102ca9a529aa7f88209c22.tar.gz | |
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 'libswscale/x86')
| -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 6901207..b50c7f2 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -8,6 +8,6 @@ MMX-OBJS += x86/hscale_fast_bilinear_simd.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 c655ae1..d59bd56 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1961,7 +1961,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL -#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 *unused, const uint8_t *src1, @@ -2601,7 +2601,7 @@ static av_cold void RENAME(rgb2rgb_init)(void) interleaveBytes = RENAME(interleaveBytes); #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL -#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 #endif |
