9 files changed, 11 insertions, 11 deletions
diff --git a/media/ffvpx/README_MCP b/media/ffvpx/README_MCP
index 784e19da5..dc099b033 100644
--- a/media/ffvpx/README_MCP
+++ b/media/ffvpx/README_MCP
@@ -7,12 +7,12 @@ Currently, we only use the vp8 and vp9 portion of the library, and only on x86
 based platforms. If this changes, configuration files will most likely
 need to be updated.
 
-AVX2 must be disabled on Linux due to the use of yasm 1.1 on the build bots.
+AVX2 must be disabled on Linux 32 bits due to the use of yasm 1.1 on the build bots.
 Once yasm is upgraded to 1.2 or later, AVX2 code could be re-enabled.
 Add --disable-avx2 to configure on those platforms.
 
 configuration files were generated as follow using the configure script:
-./configure --disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl2 --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=flac --enable-parser=flac --enable-asm --enable-yasm
+./configure --disable-everything --disable-protocols --disable-demuxers --disable-muxers --disable-filters --disable-programs --disable-doc --disable-parsers --enable-parser=vp8 --enable-parser=vp9 --enable-decoder=vp8 --enable-decoder=vp9 --disable-static --enable-shared --disable-debug --disable-sdl2 --disable-libxcb --disable-securetransport --disable-iconv --disable-swresample --disable-swscale --disable-avdevice --disable-avfilter --disable-avformat --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm
 
 config*:
 replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
@@ -21,7 +21,7 @@ config_darwin32.h:
 add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
 
 config_unix32.h:
-add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
+add to configure command: --disable-asm --disable-x86asm --cc='clang -m32'
 replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
 
 
diff --git a/media/ffvpx/config_darwin64.asm b/media/ffvpx/config_darwin64.asm
index af23f7124..4fd3fdc63 100644
--- a/media/ffvpx/config_darwin64.asm
+++ b/media/ffvpx/config_darwin64.asm
@@ -178,7 +178,7 @@
 %define HAVE_CEXP 1
 %define HAVE_INLINE_ASM 1
 %define HAVE_SYMVER 1
-%define HAVE_YASM 1
+%define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
 %define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_darwin64.h b/media/ffvpx/config_darwin64.h
index 9eee50872..c43d8c452 100644
--- a/media/ffvpx/config_darwin64.h
+++ b/media/ffvpx/config_darwin64.h
@@ -194,7 +194,7 @@
 #define HAVE_CEXP 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_SYMVER 1
-#define HAVE_YASM 1
+#define HAVE_X86ASM 1
 #define HAVE_BIGENDIAN 0
 #define HAVE_FAST_UNALIGNED 1
 #define HAVE_INCOMPATIBLE_LIBAV_ABI 0
diff --git a/media/ffvpx/config_unix32.h b/media/ffvpx/config_unix32.h
index 69808f6d7..5b4e8ab6a 100644
--- a/media/ffvpx/config_unix32.h
+++ b/media/ffvpx/config_unix32.h
@@ -194,7 +194,7 @@
 #define HAVE_CEXP 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_SYMVER 1
-#define HAVE_YASM 0
+#define HAVE_X86ASM 0
 #define HAVE_BIGENDIAN 0
 #define HAVE_FAST_UNALIGNED 0
 #define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_unix64.asm b/media/ffvpx/config_unix64.asm
index 120e6e99f..8de8b753b 100644
--- a/media/ffvpx/config_unix64.asm
+++ b/media/ffvpx/config_unix64.asm
@@ -178,7 +178,7 @@
 %define HAVE_CEXP 1
 %define HAVE_INLINE_ASM 1
 %define HAVE_SYMVER 1
-%define HAVE_YASM 1
+%define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
 %define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_win32.asm b/media/ffvpx/config_win32.asm
index 660202d0a..7dd162073 100644
--- a/media/ffvpx/config_win32.asm
+++ b/media/ffvpx/config_win32.asm
@@ -178,7 +178,7 @@
 %define HAVE_CEXP 0
 %define HAVE_INLINE_ASM 0
 %define HAVE_SYMVER 0
-%define HAVE_YASM 1
+%define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
 %define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_win32.h b/media/ffvpx/config_win32.h
index 8460c7a10..fdc0c7b7e 100644
--- a/media/ffvpx/config_win32.h
+++ b/media/ffvpx/config_win32.h
@@ -194,7 +194,7 @@
 #define HAVE_CEXP 0
 #define HAVE_INLINE_ASM 0
 #define HAVE_SYMVER 0
-#define HAVE_YASM 1
+#define HAVE_X86ASM 1
 #define HAVE_BIGENDIAN 0
 #define HAVE_FAST_UNALIGNED 1
 #define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_win64.asm b/media/ffvpx/config_win64.asm
index e492246b4..67e54c0b1 100644
--- a/media/ffvpx/config_win64.asm
+++ b/media/ffvpx/config_win64.asm
@@ -178,7 +178,7 @@
 %define HAVE_CEXP 0
 %define HAVE_INLINE_ASM 0
 %define HAVE_SYMVER 0
-%define HAVE_YASM 1
+%define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
 %define HAVE_ALSA_ASOUNDLIB_H 0
diff --git a/media/ffvpx/config_win64.h b/media/ffvpx/config_win64.h
index a24f1c523..b3a05a368 100644
--- a/media/ffvpx/config_win64.h
+++ b/media/ffvpx/config_win64.h
@@ -194,7 +194,7 @@
 #define HAVE_CEXP 0
 #define HAVE_INLINE_ASM 0
 #define HAVE_SYMVER 0
-#define HAVE_YASM 1
+#define HAVE_X86ASM 1
 #define HAVE_BIGENDIAN 0
 #define HAVE_FAST_UNALIGNED 1
 #define HAVE_ALSA_ASOUNDLIB_H 0