summaryrefslogtreecommitdiff
path: root/libswresample
diff options
context:
space:
mode:
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/audioconvert.c2
-rw-r--r--libswresample/rematrix.c2
-rw-r--r--libswresample/x86/Makefile2
-rw-r--r--libswresample/x86/rematrix_init.c2
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);