Merge pull request #801 from trav90/update-from-upstream

Update ffvpx code to 4.0.2

1 files changed, 88 insertions, 89 deletions

diff --git a/media/ffvpx/config_win64.asm b/media/ffvpx/config_win64.asm
index 58c61e970..fecfee498 100644
--- a/media/ffvpx/config_win64.asm
+++ b/media/ffvpx/config_win64.asm
@@ -1,3 +1,4 @@
+; Automatically generated by configure - do not modify!
 %define ARCH_AARCH64 0
 %define ARCH_ALPHA 0
 %define ARCH_ARM 0
@@ -41,6 +42,7 @@
 %define HAVE_AMD3DNOWEXT 1
 %define HAVE_AVX 1
 %define HAVE_AVX2 1
+%define HAVE_AVX512 1
 %define HAVE_FMA3 1
 %define HAVE_FMA4 1
 %define HAVE_MMX 1
@@ -85,6 +87,7 @@
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
 %define HAVE_AVX2_EXTERNAL 1
+%define HAVE_AVX512_EXTERNAL 0
 %define HAVE_FMA3_EXTERNAL 1
 %define HAVE_FMA4_EXTERNAL 1
 %define HAVE_MMX_EXTERNAL 1
@@ -129,6 +132,7 @@
 %define HAVE_AMD3DNOWEXT_INLINE 0
 %define HAVE_AVX_INLINE 0
 %define HAVE_AVX2_INLINE 0
+%define HAVE_AVX512_INLINE 0
 %define HAVE_FMA3_INLINE 0
 %define HAVE_FMA4_INLINE 0
 %define HAVE_MMX_INLINE 0
@@ -156,22 +160,17 @@
 %define HAVE_MMI_INLINE 0
 %define HAVE_ALIGNED_STACK 1
 %define HAVE_FAST_64BIT 1
-%define HAVE_FAST_CLZ 0
+%define HAVE_FAST_CLZ 1
 %define HAVE_FAST_CMOV 1
-%define HAVE_LOCAL_ALIGNED_8 1
-%define HAVE_LOCAL_ALIGNED_16 1
-%define HAVE_LOCAL_ALIGNED_32 1
+%define HAVE_LOCAL_ALIGNED 1
 %define HAVE_SIMD_ALIGN_16 1
 %define HAVE_SIMD_ALIGN_32 1
-%define HAVE_ATOMICS_GCC 0
-%define HAVE_ATOMICS_SUNCC 0
-%define HAVE_ATOMICS_WIN32 1
+%define HAVE_SIMD_ALIGN_64 1
 %define HAVE_ATOMIC_CAS_PTR 0
 %define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 0
 %define HAVE_RDTSC 1
-%define HAVE_SARESTART 0
 %define HAVE_SEM_TIMEDWAIT 0
 %define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 %define HAVE_CABS 0
@@ -181,13 +180,11 @@
 %define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
-%define HAVE_ALTIVEC_H 0
 %define HAVE_ARPA_INET_H 0
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
 %define HAVE_CUDA_H 0
-%define HAVE_D3D11_H 1
 %define HAVE_DISPATCH_DISPATCH_H 0
 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0
 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
@@ -196,26 +193,17 @@
 %define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 %define HAVE_DIRECT_H 1
 %define HAVE_DIRENT_H 0
-%define HAVE_DLFCN_H 0
 %define HAVE_DXGIDEBUG_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_LINUX_PERF_EVENT_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
-%define HAVE_OPENJPEG_2_3_OPENJPEG_H 0
-%define HAVE_OPENJPEG_2_2_OPENJPEG_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_SOUNDCARD_H 0
-%define HAVE_STDATOMIC_H 0
-%define HAVE_SYS_MMAN_H 0
 %define HAVE_SYS_PARAM_H 0
 %define HAVE_SYS_RESOURCE_H 0
 %define HAVE_SYS_SELECT_H 0
@@ -259,16 +247,19 @@
 %define HAVE_SINF 1
 %define HAVE_TRUNC 1
 %define HAVE_TRUNCF 1
+%define HAVE_DOS_PATHS 1
+%define HAVE_LIBC_MSVCRT 1
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
+%define HAVE_SECTION_DATA_REL_RO 0
+%define HAVE_THREADS 1
+%define HAVE_UWP 0
+%define HAVE_WINRT 0
 %define HAVE_ACCESS 1
 %define HAVE_ALIGNED_MALLOC 1
 %define HAVE_CLOCK_GETTIME 0
 %define HAVE_CLOSESOCKET 1
 %define HAVE_COMMANDLINETOARGVW 1
-%define HAVE_COTASKMEMFREE 1
-%define HAVE_CRYPTGENRANDOM 1
 %define HAVE_FCNTL 0
-%define HAVE_FLT_LIM 1
-%define HAVE_FORK 0
 %define HAVE_GETADDRINFO 1
 %define HAVE_GETHRTIME 0
 %define HAVE_GETOPT 0
@@ -283,9 +274,7 @@
 %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_LOADLIBRARY 1
 %define HAVE_LSTAT 0
 %define HAVE_LZO1X_999_COMPRESS 0
 %define HAVE_MACH_ABSOLUTE_TIME 0
@@ -297,6 +286,7 @@
 %define HAVE_PEEKNAMEDPIPE 1
 %define HAVE_PTHREAD_CANCEL 0
 %define HAVE_SCHED_GETAFFINITY 0
+%define HAVE_SECITEMIMPORT 0
 %define HAVE_SETCONSOLETEXTATTRIBUTE 1
 %define HAVE_SETCONSOLECTRLHANDLER 1
 %define HAVE_SETMODE 1
@@ -309,16 +299,19 @@
 %define HAVE_UTGETOSTYPEFROMSTRING 0
 %define HAVE_VIRTUALALLOC 1
 %define HAVE_WGLGETPROCADDRESS 0
+%define HAVE_BCRYPT 1
+%define HAVE_VAAPI_DRM 0
+%define HAVE_VAAPI_X11 0
+%define HAVE_VDPAU_X11 0
 %define HAVE_PTHREADS 0
 %define HAVE_OS2THREADS 0
 %define HAVE_W32THREADS 1
+%define HAVE_AS_ARCH_DIRECTIVE 0
 %define HAVE_AS_DN_DIRECTIVE 0
 %define HAVE_AS_FPU_DIRECTIVE 0
 %define HAVE_AS_FUNC 0
 %define HAVE_AS_OBJECT_ARCH 0
 %define HAVE_ASM_MOD_Q 0
-%define HAVE_ATTRIBUTE_MAY_ALIAS 0
-%define HAVE_ATTRIBUTE_PACKED 0
 %define HAVE_BLOCKS_EXTENSION 0
 %define HAVE_EBP_AVAILABLE 0
 %define HAVE_EBX_AVAILABLE 0
@@ -335,7 +328,6 @@
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
-%define HAVE_CONDITION_VARIABLE_PTR 1
 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
@@ -343,7 +335,7 @@
 %define HAVE_STRUCT_IP_MREQ_SOURCE 1
 %define HAVE_STRUCT_IPV6_MREQ 1
 %define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-%define HAVE_STRUCT_POLLFD 0
+%define HAVE_STRUCT_POLLFD 1
 %define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
 %define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
 %define HAVE_STRUCT_SOCKADDR_IN6 1
@@ -351,22 +343,17 @@
 %define HAVE_STRUCT_SOCKADDR_STORAGE 1
 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-%define HAVE_ATOMICS_NATIVE 1
-%define HAVE_DOS_PATHS 1
-%define HAVE_LIBC_MSVCRT 1
 %define HAVE_MAKEINFO 1
 %define HAVE_MAKEINFO_HTML 0
-%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
+%define HAVE_OPENCL_D3D11 0
+%define HAVE_OPENCL_DRM_ARM 0
+%define HAVE_OPENCL_DRM_BEIGNET 0
+%define HAVE_OPENCL_DXVA2 0
+%define HAVE_OPENCL_VAAPI_BEIGNET 0
+%define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
-%define HAVE_SECTION_DATA_REL_RO 0
 %define HAVE_TEXI2HTML 0
-%define HAVE_THREADS 1
-%define HAVE_UWP 0
-%define HAVE_VAAPI_DRM 0
-%define HAVE_VAAPI_X11 0
-%define HAVE_VDPAU_X11 0
-%define HAVE_WINRT 0
 %define CONFIG_DOC 0
 %define CONFIG_HTMLPAGES 0
 %define CONFIG_MANPAGES 1
@@ -393,27 +380,12 @@
 %define CONFIG_SCALING_VIDEO_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
-%define CONFIG_ALSA 0
-%define CONFIG_APPKIT 0
-%define CONFIG_AVFOUNDATION 0
-%define CONFIG_BZLIB 0
-%define CONFIG_COREIMAGE 0
-%define CONFIG_ICONV 0
-%define CONFIG_JACK 0
-%define CONFIG_LIBXCB 0
-%define CONFIG_LIBXCB_SHM 0
-%define CONFIG_LIBXCB_SHAPE 0
-%define CONFIG_LIBXCB_XFIXES 0
-%define CONFIG_LZMA 0
-%define CONFIG_SCHANNEL 1
-%define CONFIG_SDL2 0
-%define CONFIG_SECURETRANSPORT 0
-%define CONFIG_SNDIO 0
-%define CONFIG_XLIB 1
-%define CONFIG_ZLIB 0
+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
 %define CONFIG_AVISYNTH 0
 %define CONFIG_FREI0R 0
 %define CONFIG_LIBCDIO 0
+%define CONFIG_LIBDAVS2 0
 %define CONFIG_LIBRUBBERBAND 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBX264 0
@@ -424,10 +396,14 @@
 %define CONFIG_LIBNDI_NEWTEK 0
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_OPENSSL 0
+%define CONFIG_LIBTLS 0
 %define CONFIG_GMP 0
+%define CONFIG_LIBLENSFUN 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
+%define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVO_AMRWBENC 0
+%define CONFIG_MBEDTLS 0
 %define CONFIG_RKMPP 0
 %define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_CHROMAPRINT 0
@@ -435,11 +411,13 @@
 %define CONFIG_GNUTLS 0
 %define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
+%define CONFIG_LIBAOM 0
 %define CONFIG_LIBASS 0
 %define CONFIG_LIBBLURAY 0
 %define CONFIG_LIBBS2B 0
 %define CONFIG_LIBCACA 0
 %define CONFIG_LIBCELT 0
+%define CONFIG_LIBCODEC2 0
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBDRM 0
 %define CONFIG_LIBFLITE 0
@@ -450,6 +428,7 @@
 %define CONFIG_LIBGSM 0
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
+%define CONFIG_LIBJACK 0
 %define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
@@ -467,12 +446,13 @@
 %define CONFIG_LIBSNAPPY 0
 %define CONFIG_LIBSOXR 0
 %define CONFIG_LIBSPEEX 0
+%define CONFIG_LIBSRT 0
 %define CONFIG_LIBSSH 0
+%define CONFIG_LIBTENSORFLOW 0
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 0
 %define CONFIG_LIBTWOLAME 0
 %define CONFIG_LIBV4L2 0
-%define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVORBIS 0
 %define CONFIG_LIBVPX 0
 %define CONFIG_LIBWAVPACK 0
@@ -481,28 +461,49 @@
 %define CONFIG_LIBZIMG 0
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
+%define CONFIG_LV2 0
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_OPENAL 0
-%define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 0
+%define CONFIG_VAPOURSYNTH 0
+%define CONFIG_ALSA 0
+%define CONFIG_APPKIT 0
+%define CONFIG_AVFOUNDATION 0
+%define CONFIG_BZLIB 0
+%define CONFIG_COREIMAGE 0
+%define CONFIG_ICONV 0
+%define CONFIG_LIBXCB 0
+%define CONFIG_LIBXCB_SHM 0
+%define CONFIG_LIBXCB_SHAPE 0
+%define CONFIG_LIBXCB_XFIXES 0
+%define CONFIG_LZMA 0
+%define CONFIG_SCHANNEL 1
+%define CONFIG_SDL2 0
+%define CONFIG_SECURETRANSPORT 0
+%define CONFIG_SNDIO 0
+%define CONFIG_XLIB 0
+%define CONFIG_ZLIB 0
+%define CONFIG_CUDA_SDK 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_LIBMFX 0
+%define CONFIG_MMAL 0
+%define CONFIG_OMX 0
+%define CONFIG_OPENCL 0
+%define CONFIG_AMF 0
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CRYSTALHD 0
-%define CONFIG_CUDA 1
-%define CONFIG_CUVID 1
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
 %define CONFIG_D3D11VA 0
 %define CONFIG_DXVA2 0
-%define CONFIG_NVENC 1
+%define CONFIG_FFNVCODEC 0
+%define CONFIG_NVDEC 0
+%define CONFIG_NVENC 0
 %define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
 %define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_V4L2_M2M 0
 %define CONFIG_XVMC 0
-%define CONFIG_CUDA_SDK 0
-%define CONFIG_LIBNPP 0
-%define CONFIG_LIBMFX 0
-%define CONFIG_MMAL 0
-%define CONFIG_OMX 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
@@ -516,18 +517,17 @@
 %define CONFIG_GPL 0
 %define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 0
-%define CONFIG_AVCODEC 1
 %define CONFIG_AVDEVICE 0
 %define CONFIG_AVFILTER 0
+%define CONFIG_SWSCALE 0
+%define CONFIG_POSTPROC 0
 %define CONFIG_AVFORMAT 0
+%define CONFIG_AVCODEC 1
+%define CONFIG_SWRESAMPLE 0
 %define CONFIG_AVRESAMPLE 0
 %define CONFIG_AVUTIL 1
-%define CONFIG_POSTPROC 0
-%define CONFIG_SWRESAMPLE 0
-%define CONFIG_SWSCALE 0
 %define CONFIG_FFPLAY 0
 %define CONFIG_FFPROBE 0
-%define CONFIG_FFSERVER 0
 %define CONFIG_FFMPEG 0
 %define CONFIG_DCT 0
 %define CONFIG_DWT 0
@@ -553,31 +553,29 @@
 %define CONFIG_XMM_CLOBBER_TEST 0
 %define CONFIG_BSFS 1
 %define CONFIG_DECODERS 1
-%define CONFIG_ENCODERS 0
-%define CONFIG_HWACCELS 0
 %define CONFIG_PARSERS 1
-%define CONFIG_INDEVS 0
-%define CONFIG_OUTDEVS 0
-%define CONFIG_FILTERS 0
-%define CONFIG_DEMUXERS 0
-%define CONFIG_MUXERS 0
-%define CONFIG_PROTOCOLS 0
 %define CONFIG_AANDCTTABLES 0
 %define CONFIG_AC3DSP 0
+%define CONFIG_ADTS_HEADER 0
 %define CONFIG_AUDIO_FRAME_QUEUE 0
 %define CONFIG_AUDIODSP 0
 %define CONFIG_BLOCKDSP 0
 %define CONFIG_BSWAPDSP 0
 %define CONFIG_CABAC 0
+%define CONFIG_CBS 0
+%define CONFIG_CBS_H264 0
+%define CONFIG_CBS_H265 0
+%define CONFIG_CBS_MPEG2 0
+%define CONFIG_CBS_VP9 0
 %define CONFIG_DIRAC_PARSE 0
+%define CONFIG_DNN 0
 %define CONFIG_DVPROFILE 0
 %define CONFIG_EXIF 0
-%define CONFIG_FAANDCT 0
-%define CONFIG_FAANIDCT 0
-%define CONFIG_FDCTDSP 0
+%define CONFIG_FAANDCT 1
+%define CONFIG_FAANIDCT 1
+%define CONFIG_FDCTDSP 1
 %define CONFIG_FLACDSP 1
 %define CONFIG_FMTCONVERT 0
-%define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_G722DSP 0
 %define CONFIG_GOLOMB 0
 %define CONFIG_GPLV3 0
@@ -592,7 +590,7 @@
 %define CONFIG_HUFFMAN 0
 %define CONFIG_HUFFYUVDSP 0
 %define CONFIG_HUFFYUVENCDSP 0
-%define CONFIG_IDCTDSP 0
+%define CONFIG_IDCTDSP 1
 %define CONFIG_IIRFILTER 0
 %define CONFIG_MDCT15 0
 %define CONFIG_INTRAX8 0
@@ -619,6 +617,7 @@
 %define CONFIG_QSV 0
 %define CONFIG_QSVDEC 0
 %define CONFIG_QSVENC 0
+%define CONFIG_QSVVPP 0
 %define CONFIG_RANGECODER 0
 %define CONFIG_RIFFDEC 0
 %define CONFIG_RIFFENC 0
@@ -642,9 +641,9 @@
 %define CONFIG_WMA_FREQS 0
 %define CONFIG_WMV2DSP 0
 %define CONFIG_NULL_BSF 1
+%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
-%define CONFIG_FLAC_PARSER 0
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1