From fd502f4f5fe8d2f241102ca9a529aa7f88209c22 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 8 Oct 2016 14:18:33 +0000 Subject: 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 --- libswresample/x86/Makefile | 2 +- libswresample/x86/rematrix_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libswresample/x86') diff --git a/libswresample/x86/Makefile b/libswresample/x86/Makefile index be44df56aa..fa0641f03f 100644 --- a/libswresample/x86/Makefile +++ b/libswresample/x86/Makefile @@ -1,4 +1,4 @@ -YASM-OBJS += x86/audio_convert.o\ +X86ASM-OBJS += x86/audio_convert.o\ x86/rematrix.o\ x86/resample.o\ diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index 5f2c5fe170..d71b41a73e 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -31,7 +31,7 @@ D(int16, mmx) D(int16, sse2) av_cold int swri_rematrix_init_x86(struct SwrContext *s){ -#if HAVE_YASM +#if HAVE_X86ASM int mm_flags = av_get_cpu_flags(); int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout); int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout); -- cgit v1.2.3