Merge branch 'TRUNK' into ARE-5.0

1 files changed, 30 insertions, 7 deletions

diff --git a/libs/ffvpx/config_unix64.asm b/libs/ffvpx/config_unix64.asm
index 574207b1d..bdc378b98 100644
--- a/libs/ffvpx/config_unix64.asm
+++ b/libs/ffvpx/config_unix64.asm
@@ -54,7 +54,7 @@
 %define HAVE_SSE42 1
 %define HAVE_SSSE3 1
 %define HAVE_XOP 1
-%define HAVE_CPUNOP 1
+%define HAVE_CPUNOP 0
 %define HAVE_I686 1
 %define HAVE_MIPSFPU 0
 %define HAVE_MIPS32R2 0
@@ -65,6 +65,7 @@
 %define HAVE_MIPSDSP 0
 %define HAVE_MIPSDSPR2 0
 %define HAVE_MSA 0
+%define HAVE_MSA2 0
 %define HAVE_LOONGSON2 0
 %define HAVE_LOONGSON3 0
 %define HAVE_MMI 0
@@ -110,6 +111,7 @@
 %define HAVE_MIPSDSP_EXTERNAL 0
 %define HAVE_MIPSDSPR2_EXTERNAL 0
 %define HAVE_MSA_EXTERNAL 0
+%define HAVE_MSA2_EXTERNAL 0
 %define HAVE_LOONGSON2_EXTERNAL 0
 %define HAVE_LOONGSON3_EXTERNAL 0
 %define HAVE_MMI_EXTERNAL 0
@@ -155,6 +157,7 @@
 %define HAVE_MIPSDSP_INLINE 0
 %define HAVE_MIPSDSPR2_INLINE 0
 %define HAVE_MSA_INLINE 0
+%define HAVE_MSA2_INLINE 0
 %define HAVE_LOONGSON2_INLINE 0
 %define HAVE_LOONGSON3_INLINE 0
 %define HAVE_MMI_INLINE 0
@@ -329,6 +332,7 @@
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
 %define HAVE_KCMVIDEOCODECTYPE_HEVC 0
+%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -385,11 +389,13 @@
 %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
 %define CONFIG_LIBX265 0
 %define CONFIG_LIBXAVS 0
+%define CONFIG_LIBXAVS2 0
 %define CONFIG_LIBXVID 0
 %define CONFIG_DECKLINK 0
 %define CONFIG_LIBNDI_NEWTEK 0
@@ -397,10 +403,13 @@
 %define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
 %define CONFIG_GMP 0
+%define CONFIG_LIBARIBB24 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
@@ -415,6 +424,7 @@
 %define CONFIG_LIBCACA 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBCODEC2 0
+%define CONFIG_LIBDAV1D 0
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBDRM 0
 %define CONFIG_LIBFLITE 0
@@ -426,6 +436,7 @@
 %define CONFIG_LIBIEC61883 0
 %define CONFIG_LIBILBC 0
 %define CONFIG_LIBJACK 0
+%define CONFIG_LIBKLVANC 0
 %define CONFIG_LIBKVAZAAR 0
 %define CONFIG_LIBMODPLUG 0
 %define CONFIG_LIBMP3LAME 0
@@ -445,6 +456,7 @@
 %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
@@ -461,6 +473,8 @@
 %define CONFIG_MEDIACODEC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENGL 0
+%define CONFIG_POCKETSPHINX 0
+%define CONFIG_VAPOURSYNTH 0
 %define CONFIG_ALSA 0
 %define CONFIG_APPKIT 1
 %define CONFIG_AVFOUNDATION 1
@@ -478,6 +492,7 @@
 %define CONFIG_SNDIO 0
 %define CONFIG_XLIB 1
 %define CONFIG_ZLIB 1
+%define CONFIG_CUDA_NVCC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 0
@@ -488,6 +503,7 @@
 %define CONFIG_AUDIOTOOLBOX 1
 %define CONFIG_CRYSTALHD 0
 %define CONFIG_CUDA 0
+%define CONFIG_CUDA_LLVM 0
 %define CONFIG_CUVID 0
 %define CONFIG_D3D11VA 0
 %define CONFIG_DXVA2 0
@@ -512,19 +528,19 @@
 %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_FFMPEG 0
-%define CONFIG_DCT 0
+%define CONFIG_DCT 1
 %define CONFIG_DWT 0
 %define CONFIG_ERROR_RESILIENCE 0
 %define CONFIG_FAAN 1
@@ -535,7 +551,7 @@
 %define CONFIG_MDCT 0
 %define CONFIG_PIXELUTILS 0
 %define CONFIG_NETWORK 0
-%define CONFIG_RDFT 0
+%define CONFIG_RDFT 1
 %define CONFIG_AUTODETECT 0
 %define CONFIG_FONTCONFIG 0
 %define CONFIG_LINUX_PERF 0
@@ -558,10 +574,14 @@
 %define CONFIG_BSWAPDSP 0
 %define CONFIG_CABAC 0
 %define CONFIG_CBS 0
+%define CONFIG_CBS_AV1 0
 %define CONFIG_CBS_H264 0
 %define CONFIG_CBS_H265 0
+%define CONFIG_CBS_JPEG 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 1
@@ -569,6 +589,7 @@
 %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
@@ -617,6 +638,7 @@
 %define CONFIG_RTPDEC 0
 %define CONFIG_RTPENC_CHAIN 0
 %define CONFIG_RV34DSP 0
+%define CONFIG_SCENE_SAD 0
 %define CONFIG_SINEWIN 0
 %define CONFIG_SNAPPY 0
 %define CONFIG_SRTP 0
@@ -638,5 +660,6 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
+%define CONFIG_MP3_DECODER 0
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1