--- a/media/ffvpx/README_MOZILLA
+++ b/media/ffvpx/README_MOZILLA
@@ -9,16 +9,19 @@ need to be updated.
 
 AVX2 must be disabled on Linux 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-sdl --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-asm --enable-yasm
 
+config*:
+replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
+
 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'
 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/
 
 

--- a/media/ffvpx/config.asm
+++ b/media/ffvpx/config.asm
@@ -187,17 +187,16 @@
 %define HAVE_D3D11_H 0
 %define HAVE_DXVA_H 0
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 0
 %define HAVE_MACH_MACH_TIME_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
-%define HAVE_MALLOC_H 1
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 1
 %define HAVE_SNDIO_H 0
 %define HAVE_SOUNDCARD_H 0
 %define HAVE_SYS_MMAN_H 1
 %define HAVE_SYS_PARAM_H 1
 %define HAVE_SYS_RESOURCE_H 1
@@ -263,28 +262,25 @@
 %define HAVE_GETTIMEOFDAY 1
 %define HAVE_GLOB 1
 %define HAVE_GLXGETPROCADDRESS 0
 %define HAVE_GMTIME_R 1
 %define HAVE_INET_ATON 1
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 0
-%define HAVE_LOCALTIME_R 1
 %define HAVE_LSTAT 1
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 0
-%define HAVE_MEMALIGN 1
 %define HAVE_MKSTEMP 1
 %define HAVE_MMAP 1
 %define HAVE_MPROTECT 1
 %define HAVE_NANOSLEEP 1
 %define HAVE_PEEKNAMEDPIPE 0
-%define HAVE_POSIX_MEMALIGN 1
 %define HAVE_PTHREAD_CANCEL 1
 %define HAVE_SCHED_GETAFFINITY 1
 %define HAVE_SETCONSOLETEXTATTRIBUTE 0
 %define HAVE_SETCONSOLECTRLHANDLER 0
 %define HAVE_SETMODE 0
 %define HAVE_SETRLIMIT 1
 %define HAVE_SLEEP 0
 %define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_darwin32.h
+++ b/media/ffvpx/config_darwin32.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 0
 #define HAVE_DXVA_H 0
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 0
 #define HAVE_MACH_MACH_TIME_H 1
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 0
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 1
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 0
-#define HAVE_ARC4RANDOM 1
 #define HAVE_CLOCK_GETTIME 0
 #define HAVE_CLOSESOCKET 0
 #define HAVE_COMMANDLINETOARGVW 0
 #define HAVE_COTASKMEMFREE 0
 #define HAVE_CRYPTGENRANDOM 0
 #define HAVE_DLOPEN 1
 #define HAVE_FCNTL 1
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GLOB 1
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 1
 #define HAVE_INET_ATON 1
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 0
-#define HAVE_LOCALTIME_R 1
 #define HAVE_LSTAT 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 1
 #define HAVE_MAPVIEWOFFILE 0
-#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_MMAP 1
 #define HAVE_MPROTECT 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_PEEKNAMEDPIPE 0
-#define HAVE_POSIX_MEMALIGN 1
 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
 #define HAVE_SETCONSOLECTRLHANDLER 0
 #define HAVE_SETMODE 0
 #define HAVE_SETRLIMIT 1
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_darwin64.asm
+++ b/media/ffvpx/config_darwin64.asm
@@ -195,17 +195,16 @@
 %define HAVE_D3D11_H 0
 %define HAVE_DXVA_H 0
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 0
 %define HAVE_MACH_MACH_TIME_H 1
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
-%define HAVE_MALLOC_H 0
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 1
 %define HAVE_SNDIO_H 0
 %define HAVE_SOUNDCARD_H 0
@@ -250,17 +249,16 @@
 %define HAVE_RINT 1
 %define HAVE_ROUND 1
 %define HAVE_ROUNDF 1
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 0
-%define HAVE_ARC4RANDOM 1
 %define HAVE_CLOCK_GETTIME 0
 %define HAVE_CLOSESOCKET 0
 %define HAVE_COMMANDLINETOARGVW 0
 %define HAVE_COTASKMEMFREE 0
 %define HAVE_CRYPTGENRANDOM 0
 %define HAVE_DLOPEN 1
 %define HAVE_FCNTL 1
 %define HAVE_FLT_LIM 1
@@ -276,28 +274,25 @@
 %define HAVE_GETTIMEOFDAY 1
 %define HAVE_GLOB 1
 %define HAVE_GLXGETPROCADDRESS 0
 %define HAVE_GMTIME_R 1
 %define HAVE_INET_ATON 1
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 0
-%define HAVE_LOCALTIME_R 1
 %define HAVE_LSTAT 1
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 1
 %define HAVE_MAPVIEWOFFILE 0
-%define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 1
 %define HAVE_MMAP 1
 %define HAVE_MPROTECT 1
 %define HAVE_NANOSLEEP 1
 %define HAVE_PEEKNAMEDPIPE 0
-%define HAVE_POSIX_MEMALIGN 1
 %define HAVE_PTHREAD_CANCEL 1
 %define HAVE_SCHED_GETAFFINITY 0
 %define HAVE_SETCONSOLETEXTATTRIBUTE 0
 %define HAVE_SETCONSOLECTRLHANDLER 0
 %define HAVE_SETMODE 0
 %define HAVE_SETRLIMIT 1
 %define HAVE_SLEEP 0
 %define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_darwin64.h
+++ b/media/ffvpx/config_darwin64.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 0
 #define HAVE_DXVA_H 0
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 0
 #define HAVE_MACH_MACH_TIME_H 1
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 0
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 1
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 0
-#define HAVE_ARC4RANDOM 1
 #define HAVE_CLOCK_GETTIME 0
 #define HAVE_CLOSESOCKET 0
 #define HAVE_COMMANDLINETOARGVW 0
 #define HAVE_COTASKMEMFREE 0
 #define HAVE_CRYPTGENRANDOM 0
 #define HAVE_DLOPEN 1
 #define HAVE_FCNTL 1
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GLOB 1
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 1
 #define HAVE_INET_ATON 1
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 0
-#define HAVE_LOCALTIME_R 1
 #define HAVE_LSTAT 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 1
 #define HAVE_MAPVIEWOFFILE 0
-#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_MMAP 1
 #define HAVE_MPROTECT 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_PEEKNAMEDPIPE 0
-#define HAVE_POSIX_MEMALIGN 1
 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
 #define HAVE_SETCONSOLECTRLHANDLER 0
 #define HAVE_SETMODE 0
 #define HAVE_SETRLIMIT 1
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_unix32.h
+++ b/media/ffvpx/config_unix32.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 0
 #define HAVE_DXVA_H 0
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 0
 #define HAVE_MACH_MACH_TIME_H 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 1
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 0
-#define HAVE_ARC4RANDOM 0
 #define HAVE_CLOCK_GETTIME 1
 #define HAVE_CLOSESOCKET 0
 #define HAVE_COMMANDLINETOARGVW 0
 #define HAVE_COTASKMEMFREE 0
 #define HAVE_CRYPTGENRANDOM 0
 #define HAVE_DLOPEN 1
 #define HAVE_FCNTL 1
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GLOB 1
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 1
 #define HAVE_INET_ATON 1
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 0
-#define HAVE_LOCALTIME_R 1
 #define HAVE_LSTAT 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 0
-#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_MMAP 1
 #define HAVE_MPROTECT 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_PEEKNAMEDPIPE 0
-#define HAVE_POSIX_MEMALIGN 0
 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_SCHED_GETAFFINITY 1
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
 #define HAVE_SETCONSOLECTRLHANDLER 0
 #define HAVE_SETMODE 0
 #define HAVE_SETRLIMIT 1
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_unix64.asm
+++ b/media/ffvpx/config_unix64.asm
@@ -195,17 +195,16 @@
 %define HAVE_D3D11_H 0
 %define HAVE_DXVA_H 0
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 0
 %define HAVE_MACH_MACH_TIME_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
-%define HAVE_MALLOC_H 1
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 1
 %define HAVE_SNDIO_H 0
 %define HAVE_SOUNDCARD_H 0
@@ -250,17 +249,16 @@
 %define HAVE_RINT 1
 %define HAVE_ROUND 1
 %define HAVE_ROUNDF 1
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 0
-%define HAVE_ARC4RANDOM 0
 %define HAVE_CLOCK_GETTIME 1
 %define HAVE_CLOSESOCKET 0
 %define HAVE_COMMANDLINETOARGVW 0
 %define HAVE_COTASKMEMFREE 0
 %define HAVE_CRYPTGENRANDOM 0
 %define HAVE_DLOPEN 1
 %define HAVE_FCNTL 1
 %define HAVE_FLT_LIM 1
@@ -276,28 +274,25 @@
 %define HAVE_GETTIMEOFDAY 1
 %define HAVE_GLOB 1
 %define HAVE_GLXGETPROCADDRESS 0
 %define HAVE_GMTIME_R 1
 %define HAVE_INET_ATON 1
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 0
-%define HAVE_LOCALTIME_R 1
 %define HAVE_LSTAT 1
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 0
-%define HAVE_MEMALIGN 1
 %define HAVE_MKSTEMP 1
 %define HAVE_MMAP 1
 %define HAVE_MPROTECT 1
 %define HAVE_NANOSLEEP 1
 %define HAVE_PEEKNAMEDPIPE 0
-%define HAVE_POSIX_MEMALIGN 1
 %define HAVE_PTHREAD_CANCEL 1
 %define HAVE_SCHED_GETAFFINITY 1
 %define HAVE_SETCONSOLETEXTATTRIBUTE 0
 %define HAVE_SETCONSOLECTRLHANDLER 0
 %define HAVE_SETMODE 0
 %define HAVE_SETRLIMIT 1
 %define HAVE_SLEEP 0
 %define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_unix64.h
+++ b/media/ffvpx/config_unix64.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 0
 #define HAVE_DXVA_H 0
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 0
 #define HAVE_MACH_MACH_TIME_H 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 1
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 0
-#define HAVE_ARC4RANDOM 0
 #define HAVE_CLOCK_GETTIME 1
 #define HAVE_CLOSESOCKET 0
 #define HAVE_COMMANDLINETOARGVW 0
 #define HAVE_COTASKMEMFREE 0
 #define HAVE_CRYPTGENRANDOM 0
 #define HAVE_DLOPEN 1
 #define HAVE_FCNTL 1
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_GLOB 1
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 1
 #define HAVE_INET_ATON 1
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 0
-#define HAVE_LOCALTIME_R 1
 #define HAVE_LSTAT 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 0
-#define HAVE_MEMALIGN 1
 #define HAVE_MKSTEMP 1
 #define HAVE_MMAP 1
 #define HAVE_MPROTECT 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_PEEKNAMEDPIPE 0
-#define HAVE_POSIX_MEMALIGN 1
 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_SCHED_GETAFFINITY 1
 #define HAVE_SETCONSOLETEXTATTRIBUTE 0
 #define HAVE_SETCONSOLECTRLHANDLER 0
 #define HAVE_SETMODE 0
 #define HAVE_SETRLIMIT 1
 #define HAVE_SLEEP 0
 #define HAVE_STRERROR_R 1

--- a/media/ffvpx/config_win32.asm
+++ b/media/ffvpx/config_win32.asm
@@ -195,17 +195,16 @@
 %define HAVE_D3D11_H 1
 %define HAVE_DXVA_H 1
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 1
 %define HAVE_MACH_MACH_TIME_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
-%define HAVE_MALLOC_H 1
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 0
 %define HAVE_SNDIO_H 0
 %define HAVE_SOUNDCARD_H 0
@@ -250,17 +249,16 @@
 %define HAVE_RINT 1
 %define HAVE_ROUND 1
 %define HAVE_ROUNDF 1
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 1
-%define HAVE_ARC4RANDOM 0
 %define HAVE_CLOCK_GETTIME 0
 %define HAVE_CLOSESOCKET 1
 %define HAVE_COMMANDLINETOARGVW 1
 %define HAVE_COTASKMEMFREE 1
 %define HAVE_CRYPTGENRANDOM 1
 %define HAVE_DLOPEN 0
 %define HAVE_FCNTL 0
 %define HAVE_FLT_LIM 1
@@ -276,28 +274,25 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
 %define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 1
-%define HAVE_LOCALTIME_R 0
 %define HAVE_LSTAT 0
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
-%define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
 %define HAVE_MPROTECT 0
 %define HAVE_NANOSLEEP 0
 %define HAVE_PEEKNAMEDPIPE 1
-%define HAVE_POSIX_MEMALIGN 0
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 0
 %define HAVE_SETCONSOLETEXTATTRIBUTE 1
 %define HAVE_SETCONSOLECTRLHANDLER 1
 %define HAVE_SETMODE 1
 %define HAVE_SETRLIMIT 0
 %define HAVE_SLEEP 1
 %define HAVE_STRERROR_R 0

--- a/media/ffvpx/config_win32.h
+++ b/media/ffvpx/config_win32.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 1
 #define HAVE_DXVA_H 1
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 1
 #define HAVE_MACH_MACH_TIME_H 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 0
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 1
-#define HAVE_ARC4RANDOM 0
 #define HAVE_CLOCK_GETTIME 0
 #define HAVE_CLOSESOCKET 1
 #define HAVE_COMMANDLINETOARGVW 1
 #define HAVE_COTASKMEMFREE 1
 #define HAVE_CRYPTGENRANDOM 1
 #define HAVE_DLOPEN 0
 #define HAVE_FCNTL 0
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 1
-#define HAVE_LOCALTIME_R 0
 #define HAVE_LSTAT 0
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
-#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
 #define HAVE_MPROTECT 0
 #define HAVE_NANOSLEEP 0
 #define HAVE_PEEKNAMEDPIPE 1
-#define HAVE_POSIX_MEMALIGN 0
 #define HAVE_PTHREAD_CANCEL 0
 #define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SETCONSOLETEXTATTRIBUTE 1
 #define HAVE_SETCONSOLECTRLHANDLER 1
 #define HAVE_SETMODE 1
 #define HAVE_SETRLIMIT 0
 #define HAVE_SLEEP 1
 #define HAVE_STRERROR_R 0

--- a/media/ffvpx/config_win64.asm
+++ b/media/ffvpx/config_win64.asm
@@ -195,17 +195,16 @@
 %define HAVE_D3D11_H 1
 %define HAVE_DXVA_H 1
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 1
 %define HAVE_MACH_MACH_TIME_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
-%define HAVE_MALLOC_H 1
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 0
 %define HAVE_SNDIO_H 0
 %define HAVE_SOUNDCARD_H 0
@@ -250,17 +249,16 @@
 %define HAVE_RINT 1
 %define HAVE_ROUND 1
 %define HAVE_ROUNDF 1
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 1
-%define HAVE_ARC4RANDOM 0
 %define HAVE_CLOCK_GETTIME 0
 %define HAVE_CLOSESOCKET 1
 %define HAVE_COMMANDLINETOARGVW 1
 %define HAVE_COTASKMEMFREE 1
 %define HAVE_CRYPTGENRANDOM 1
 %define HAVE_DLOPEN 0
 %define HAVE_FCNTL 0
 %define HAVE_FLT_LIM 1
@@ -276,28 +274,25 @@
 %define HAVE_GETTIMEOFDAY 0
 %define HAVE_GLOB 0
 %define HAVE_GLXGETPROCADDRESS 0
 %define HAVE_GMTIME_R 0
 %define HAVE_INET_ATON 0
 %define HAVE_ISATTY 1
 %define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 %define HAVE_KBHIT 1
-%define HAVE_LOCALTIME_R 0
 %define HAVE_LSTAT 0
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
 %define HAVE_MAPVIEWOFFILE 1
-%define HAVE_MEMALIGN 0
 %define HAVE_MKSTEMP 0
 %define HAVE_MMAP 0
 %define HAVE_MPROTECT 0
 %define HAVE_NANOSLEEP 0
 %define HAVE_PEEKNAMEDPIPE 1
-%define HAVE_POSIX_MEMALIGN 0
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 0
 %define HAVE_SETCONSOLETEXTATTRIBUTE 1
 %define HAVE_SETCONSOLECTRLHANDLER 1
 %define HAVE_SETMODE 1
 %define HAVE_SETRLIMIT 0
 %define HAVE_SLEEP 1
 %define HAVE_STRERROR_R 0

--- a/media/ffvpx/config_win64.h
+++ b/media/ffvpx/config_win64.h
@@ -211,17 +211,16 @@
 #define HAVE_D3D11_H 1
 #define HAVE_DXVA_H 1
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 1
 #define HAVE_MACH_MACH_TIME_H 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
 #define HAVE_OPENGL_GL3_H 0
 #define HAVE_POLL_H 0
 #define HAVE_SNDIO_H 0
 #define HAVE_SOUNDCARD_H 0
@@ -266,17 +265,16 @@
 #define HAVE_RINT 1
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SINF 1
 #define HAVE_TRUNC 1
 #define HAVE_TRUNCF 1
 #define HAVE_ACCESS 1
 #define HAVE_ALIGNED_MALLOC 1
-#define HAVE_ARC4RANDOM 0
 #define HAVE_CLOCK_GETTIME 0
 #define HAVE_CLOSESOCKET 1
 #define HAVE_COMMANDLINETOARGVW 1
 #define HAVE_COTASKMEMFREE 1
 #define HAVE_CRYPTGENRANDOM 1
 #define HAVE_DLOPEN 0
 #define HAVE_FCNTL 0
 #define HAVE_FLT_LIM 1
@@ -292,28 +290,25 @@
 #define HAVE_GETTIMEOFDAY 0
 #define HAVE_GLOB 0
 #define HAVE_GLXGETPROCADDRESS 0
 #define HAVE_GMTIME_R 0
 #define HAVE_INET_ATON 0
 #define HAVE_ISATTY 1
 #define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
 #define HAVE_KBHIT 1
-#define HAVE_LOCALTIME_R 0
 #define HAVE_LSTAT 0
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACH_ABSOLUTE_TIME 0
 #define HAVE_MAPVIEWOFFILE 1
-#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 0
 #define HAVE_MMAP 0
 #define HAVE_MPROTECT 0
 #define HAVE_NANOSLEEP 0
 #define HAVE_PEEKNAMEDPIPE 1
-#define HAVE_POSIX_MEMALIGN 0
 #define HAVE_PTHREAD_CANCEL 0
 #define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SETCONSOLETEXTATTRIBUTE 1
 #define HAVE_SETCONSOLECTRLHANDLER 1
 #define HAVE_SETMODE 1
 #define HAVE_SETRLIMIT 0
 #define HAVE_SLEEP 1
 #define HAVE_STRERROR_R 0