--- a/media/ffvpx/config_unix64.asm
+++ b/media/ffvpx/config_unix64.asm
@@ -35,17 +35,17 @@
 %define HAVE_LDBRX 0
 %define HAVE_POWER8 0
 %define HAVE_PPC4XX 0
 %define HAVE_VSX 0
 %define HAVE_AESNI 1
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
-%define HAVE_AVX2 0
+%define HAVE_AVX2 1
 %define HAVE_FMA3 1
 %define HAVE_FMA4 1
 %define HAVE_MMX 1
 %define HAVE_MMXEXT 1
 %define HAVE_SSE 1
 %define HAVE_SSE2 1
 %define HAVE_SSE3 1
 %define HAVE_SSE4 1
@@ -79,17 +79,17 @@
 %define HAVE_LDBRX_EXTERNAL 0
 %define HAVE_POWER8_EXTERNAL 0
 %define HAVE_PPC4XX_EXTERNAL 0
 %define HAVE_VSX_EXTERNAL 0
 %define HAVE_AESNI_EXTERNAL 1
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
-%define HAVE_AVX2_EXTERNAL 0
+%define HAVE_AVX2_EXTERNAL 1
 %define HAVE_FMA3_EXTERNAL 1
 %define HAVE_FMA4_EXTERNAL 1
 %define HAVE_MMX_EXTERNAL 1
 %define HAVE_MMXEXT_EXTERNAL 1
 %define HAVE_SSE_EXTERNAL 1
 %define HAVE_SSE2_EXTERNAL 1
 %define HAVE_SSE3_EXTERNAL 1
 %define HAVE_SSE4_EXTERNAL 1
@@ -123,17 +123,17 @@
 %define HAVE_LDBRX_INLINE 0
 %define HAVE_POWER8_INLINE 0
 %define HAVE_PPC4XX_INLINE 0
 %define HAVE_VSX_INLINE 0
 %define HAVE_AESNI_INLINE 1
 %define HAVE_AMD3DNOW_INLINE 1
 %define HAVE_AMD3DNOWEXT_INLINE 1
 %define HAVE_AVX_INLINE 1
-%define HAVE_AVX2_INLINE 0
+%define HAVE_AVX2_INLINE 1
 %define HAVE_FMA3_INLINE 1
 %define HAVE_FMA4_INLINE 1
 %define HAVE_MMX_INLINE 1
 %define HAVE_MMXEXT_INLINE 1
 %define HAVE_SSE_INLINE 1
 %define HAVE_SSE2_INLINE 1
 %define HAVE_SSE3_INLINE 1
 %define HAVE_SSE4_INLINE 1

--- a/media/ffvpx/config_unix64.h
+++ b/media/ffvpx/config_unix64.h
@@ -51,17 +51,17 @@
 #define HAVE_LDBRX 0
 #define HAVE_POWER8 0
 #define HAVE_PPC4XX 0
 #define HAVE_VSX 0
 #define HAVE_AESNI 1
 #define HAVE_AMD3DNOW 1
 #define HAVE_AMD3DNOWEXT 1
 #define HAVE_AVX 1
-#define HAVE_AVX2 0
+#define HAVE_AVX2 1
 #define HAVE_FMA3 1
 #define HAVE_FMA4 1
 #define HAVE_MMX 1
 #define HAVE_MMXEXT 1
 #define HAVE_SSE 1
 #define HAVE_SSE2 1
 #define HAVE_SSE3 1
 #define HAVE_SSE4 1
@@ -95,17 +95,17 @@
 #define HAVE_LDBRX_EXTERNAL 0
 #define HAVE_POWER8_EXTERNAL 0
 #define HAVE_PPC4XX_EXTERNAL 0
 #define HAVE_VSX_EXTERNAL 0
 #define HAVE_AESNI_EXTERNAL 1
 #define HAVE_AMD3DNOW_EXTERNAL 1
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
-#define HAVE_AVX2_EXTERNAL 0
+#define HAVE_AVX2_EXTERNAL 1
 #define HAVE_FMA3_EXTERNAL 1
 #define HAVE_FMA4_EXTERNAL 1
 #define HAVE_MMX_EXTERNAL 1
 #define HAVE_MMXEXT_EXTERNAL 1
 #define HAVE_SSE_EXTERNAL 1
 #define HAVE_SSE2_EXTERNAL 1
 #define HAVE_SSE3_EXTERNAL 1
 #define HAVE_SSE4_EXTERNAL 1
@@ -139,17 +139,17 @@
 #define HAVE_LDBRX_INLINE 0
 #define HAVE_POWER8_INLINE 0
 #define HAVE_PPC4XX_INLINE 0
 #define HAVE_VSX_INLINE 0
 #define HAVE_AESNI_INLINE 1
 #define HAVE_AMD3DNOW_INLINE 1
 #define HAVE_AMD3DNOWEXT_INLINE 1
 #define HAVE_AVX_INLINE 1
-#define HAVE_AVX2_INLINE 0
+#define HAVE_AVX2_INLINE 1
 #define HAVE_FMA3_INLINE 1
 #define HAVE_FMA4_INLINE 1
 #define HAVE_MMX_INLINE 1
 #define HAVE_MMXEXT_INLINE 1
 #define HAVE_SSE_INLINE 1
 #define HAVE_SSE2_INLINE 1
 #define HAVE_SSE3_INLINE 1
 #define HAVE_SSE4_INLINE 1