build: Drop AVX assembly ifdefs

An assembler able to cope with AVX instructions is now required.

2 files changed, 0 insertions, 42 deletions

diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm
index 1d125c2b50..1af1429bae 100644
--- a/libavresample/x86/audio_convert.asm
+++ b/libavresample/x86/audio_convert.asm
@@ -155,10 +155,8 @@ cglobal conv_s32_to_flt, 3,3,3, dst, src, len
 
 INIT_XMM sse2
 CONV_S32_TO_FLT
-%if HAVE_AVX_EXTERNAL
 INIT_YMM avx
 CONV_S32_TO_FLT
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_flt_to_s16(int16_t *dst, const float *src, int len);
@@ -228,10 +226,8 @@ cglobal conv_flt_to_s32, 3,3,6, dst, src, len
 
 INIT_XMM sse2
 CONV_FLT_TO_S32
-%if HAVE_AVX_EXTERNAL
 INIT_YMM avx
 CONV_FLT_TO_S32
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16p_to_s16_2ch(int16_t *dst, int16_t *const *src, int len,
@@ -265,10 +261,8 @@ cglobal conv_s16p_to_s16_2ch, 3,4,5, dst, src0, len, src1
 
 INIT_XMM sse2
 CONV_S16P_TO_S16_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16P_TO_S16_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16p_to_s16_6ch(int16_t *dst, int16_t *const *src, int len,
@@ -388,10 +382,8 @@ INIT_XMM sse2
 CONV_S16P_TO_S16_6CH
 INIT_XMM sse2slow
 CONV_S16P_TO_S16_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16P_TO_S16_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16p_to_flt_2ch(float *dst, int16_t *const *src, int len,
@@ -437,10 +429,8 @@ cglobal conv_s16p_to_flt_2ch, 3,4,6, dst, src0, len, src1
 
 INIT_XMM sse2
 CONV_S16P_TO_FLT_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16P_TO_FLT_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16p_to_flt_6ch(float *dst, int16_t *const *src, int len,
@@ -541,10 +531,8 @@ INIT_XMM sse2
 CONV_S16P_TO_FLT_6CH
 INIT_XMM ssse3
 CONV_S16P_TO_FLT_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16P_TO_FLT_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_fltp_to_s16_2ch(int16_t *dst, float *const *src, int len,
@@ -697,10 +685,8 @@ INIT_MMX sse
 CONV_FLTP_TO_S16_6CH
 INIT_XMM sse2
 CONV_FLTP_TO_S16_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLTP_TO_S16_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_fltp_to_flt_2ch(float *dst, float *const *src, int len,
@@ -734,10 +720,8 @@ cglobal conv_fltp_to_flt_2ch, 3,4,5, dst, src0, len, src1
 
 INIT_XMM sse
 CONV_FLTP_TO_FLT_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLTP_TO_FLT_2CH
-%endif
 
 ;-----------------------------------------------------------------------------
 ; void ff_conv_fltp_to_flt_6ch(float *dst, float *const *src, int len,
@@ -815,10 +799,8 @@ INIT_MMX mmx
 CONV_FLTP_TO_FLT_6CH
 INIT_XMM sse4
 CONV_FLTP_TO_FLT_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLTP_TO_FLT_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16_to_s16p_2ch(int16_t *const *dst, int16_t *src, int len,
@@ -864,10 +846,8 @@ INIT_XMM sse2
 CONV_S16_TO_S16P_2CH
 INIT_XMM ssse3
 CONV_S16_TO_S16P_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16_TO_S16P_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16_to_s16p_6ch(int16_t *const *dst, int16_t *src, int len,
@@ -923,10 +903,8 @@ INIT_XMM sse2
 CONV_S16_TO_S16P_6CH
 INIT_XMM ssse3
 CONV_S16_TO_S16P_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16_TO_S16P_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16_to_fltp_2ch(float *const *dst, int16_t *src, int len,
@@ -961,10 +939,8 @@ cglobal conv_s16_to_fltp_2ch, 3,4,5, dst0, src, len, dst1
 
 INIT_XMM sse2
 CONV_S16_TO_FLTP_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16_TO_FLTP_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_s16_to_fltp_6ch(float *const *dst, int16_t *src, int len,
@@ -1042,10 +1018,8 @@ INIT_XMM ssse3
 CONV_S16_TO_FLTP_6CH
 INIT_XMM sse4
 CONV_S16_TO_FLTP_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_S16_TO_FLTP_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_flt_to_s16p_2ch(int16_t *const *dst, float *src, int len,
@@ -1088,10 +1062,8 @@ cglobal conv_flt_to_s16p_2ch, 3,4,6, dst0, src, len, dst1
 
 INIT_XMM sse2
 CONV_FLT_TO_S16P_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLT_TO_S16P_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_flt_to_s16p_6ch(int16_t *const *dst, float *src, int len,
@@ -1160,10 +1132,8 @@ INIT_XMM sse2
 CONV_FLT_TO_S16P_6CH
 INIT_XMM ssse3
 CONV_FLT_TO_S16P_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLT_TO_S16P_6CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_flt_to_fltp_2ch(float *const *dst, float *src, int len,
@@ -1192,10 +1162,8 @@ cglobal conv_flt_to_fltp_2ch, 3,4,3, dst0, src, len, dst1
 
 INIT_XMM sse
 CONV_FLT_TO_FLTP_2CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLT_TO_FLTP_2CH
-%endif
 
 ;------------------------------------------------------------------------------
 ; void ff_conv_flt_to_fltp_6ch(float *const *dst, float *src, int len,
@@ -1255,7 +1223,5 @@ cglobal conv_flt_to_fltp_6ch, 2,7,7, dst, src, dst1, dst2, dst3, dst4, dst5
 
 INIT_XMM sse2
 CONV_FLT_TO_FLTP_6CH
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 CONV_FLT_TO_FLTP_6CH
-%endif
diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index 7f3b5b9080..47c23e4584 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -55,10 +55,8 @@ cglobal mix_2_to_1_fltp_flt, 3,4,6, src, matrix, len, src1
 
 INIT_XMM sse
 MIX_2_TO_1_FLTP_FLT
-%if HAVE_AVX_EXTERNAL
 INIT_YMM avx
 MIX_2_TO_1_FLTP_FLT
-%endif
 
 ;-----------------------------------------------------------------------------
 ; void ff_mix_2_to_1_s16p_flt(int16_t **src, float **matrix, int len,
@@ -174,10 +172,8 @@ cglobal mix_1_to_2_fltp_flt, 3,5,4, src0, matrix0, len, src1, matrix1
 
 INIT_XMM sse
 MIX_1_TO_2_FLTP_FLT
-%if HAVE_AVX_EXTERNAL
 INIT_YMM avx
 MIX_1_TO_2_FLTP_FLT
-%endif
 
 ;-----------------------------------------------------------------------------
 ; void ff_mix_1_to_2_s16p_flt(int16_t **src, float **matrix, int len,
@@ -221,10 +217,8 @@ INIT_XMM sse2
 MIX_1_TO_2_S16P_FLT
 INIT_XMM sse4
 MIX_1_TO_2_S16P_FLT
-%if HAVE_AVX_EXTERNAL
 INIT_XMM avx
 MIX_1_TO_2_S16P_FLT
-%endif
 
 ;-----------------------------------------------------------------------------
 ; void ff_mix_3_8_to_1_2_fltp/s16p_flt(float/int16_t **src, float **matrix,
@@ -489,7 +483,6 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, s
     MIX_3_8_TO_1_2_FLT %%i, 1, s16p
     MIX_3_8_TO_1_2_FLT %%i, 2, s16p
     ; do not use ymm AVX or FMA4 in x86-32 for 6 or more channels due to stack alignment issues
-    %if HAVE_AVX_EXTERNAL
     %if ARCH_X86_64 || %%i < 6
     INIT_YMM avx
     %else
@@ -500,7 +493,6 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, s
     INIT_XMM avx
     MIX_3_8_TO_1_2_FLT %%i, 1, s16p
     MIX_3_8_TO_1_2_FLT %%i, 2, s16p
-    %endif
     %if HAVE_FMA4_EXTERNAL
     %if ARCH_X86_64 || %%i < 6
     INIT_YMM fma4