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 /libswresample | |
| parent | 664ac7c5e2e9b2b001be6124b90b398861c773af (diff) | |
| download | ffmpeg-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 'libswresample')
| -rw-r--r-- | libswresample/audioconvert.c | 2 | ||||
| -rw-r--r-- | libswresample/rematrix.c | 2 | ||||
| -rw-r--r-- | libswresample/x86/Makefile | 2 | ||||
| -rw-r--r-- | libswresample/x86/rematrix_init.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c index 542bd01242..96ce84ac44 100644 --- a/libswresample/audioconvert.c +++ b/libswresample/audioconvert.c @@ -176,7 +176,7 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt, } } - if(HAVE_YASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels); + if(HAVE_X86ASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels); if(ARCH_ARM) swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels); if(ARCH_AARCH64) swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels); diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 03b9b20900..66a43c16c1 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -470,7 +470,7 @@ av_cold int swri_rematrix_init(SwrContext *s){ s->matrix_ch[i][0]= ch_in; } - if(HAVE_YASM && HAVE_MMX) + if(HAVE_X86ASM && HAVE_MMX) return swri_rematrix_init_x86(s); return 0; 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); |