Bug 1616736 - P2. Update ffmpeg copy to 4.2. r=jolin

Also fix AARCH64 build to be neon optimised where available, this leads to a 72% improvement in decoding speed.

Differential Revision: https://phabricator.services.mozilla.com/D64706

--HG--
extra : moz-landing-system : lando

media/ffvpx/FILES

@@ -4,6 +4,42 @@
 ./compat/va_copy.h
 ./compat/w32pthreads.h
 ./libavcodec/allcodecs.c
+./libavcodec/aarch64/fft_init_aarch64.c
+./libavcodec/aarch64/fft_neon.S
+./libavcodec/aarch64/h264chroma_init_aarch64.c
+./libavcodec/aarch64/h264cmc_neon.S
+./libavcodec/aarch64/h264dsp_init_aarch64.c
+./libavcodec/aarch64/h264dsp_neon.S
+./libavcodec/aarch64/h264idct_neon.S
+./libavcodec/aarch64/h264pred_init.c
+./libavcodec/aarch64/h264pred_neon.S
+./libavcodec/aarch64/hpeldsp_init_aarch64.c
+./libavcodec/aarch64/hpeldsp_neon.S
+./libavcodec/aarch64/idct.h
+./libavcodec/aarch64/idctdsp_init_aarch64.c
+./libavcodec/aarch64/mdct_neon.S
+./libavcodec/aarch64/moz.build
+./libavcodec/aarch64/mpegaudiodsp_init.c
+./libavcodec/aarch64/mpegaudiodsp_neon.S
+./libavcodec/aarch64/neon.S
+./libavcodec/aarch64/simple_idct_neon.S
+./libavcodec/aarch64/vc1dsp_init_aarch64.c
+./libavcodec/aarch64/videodsp.S
+./libavcodec/aarch64/videodsp_init.c
+./libavcodec/aarch64/vp8dsp_init_aarch64.c
+./libavcodec/aarch64/vp8dsp.h
+./libavcodec/aarch64/vp8dsp_neon.S
+./libavcodec/aarch64/vp9dsp_init.h
+./libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
+./libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
+./libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
+./libavcodec/aarch64/vp9dsp_init_aarch64.c
+./libavcodec/aarch64/vp9itxfm_16bpp_neon.S
+./libavcodec/aarch64/vp9itxfm_neon.S
+./libavcodec/aarch64/vp9lpf_16bpp_neon.S
+./libavcodec/aarch64/vp9lpf_neon.S
+./libavcodec/aarch64/vp9mc_16bpp_neon.S
+./libavcodec/aarch64/vp9mc_neon.S
 ./libavcodec/arm/flacdsp_arm.S
 ./libavcodec/arm/flacdsp_init_arm.c
 ./libavcodec/arm/mathops.h
@@ -72,6 +108,7 @@
 ./libavcodec/options_table.h
 ./libavcodec/parser.c
 ./libavcodec/parser.h
+./libavcodec/parsers.c
 ./libavcodec/pixblockdsp.h
 ./libavcodec/profiles.c
 ./libavcodec/profiles.h

media/ffvpx/README_MOZILLA

@@ -1,8 +1,8 @@
 This directory contains files used in gecko builds from FFmpeg
 (http://ffmpeg.org). The current files are from FFmpeg as of
-revision n4.0.2-6-g2be51cbeea
+revision n4.2.2-1-g19bfd72126
 git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
-git checkout n4.0.2-6-g2be51cbeea
+git checkout n4.2.2-1-g19bfd72126
 
 All source files match their path from the library's source archive.
 
@@ -14,19 +14,9 @@ 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-vdpau \
-            --disable-videotoolbox --enable-decoder=flac --enable-asm \
-            --enable-x86asm --disable-cuda --disable-cuvid \
-            --enable-decoder=mp3
-
+ ./configure --disable-all --enable-avcodec --enable-decoder=vp8,vp9,mp3,flac \
+             --enable-parser=vp8,vp9 --disable-static --enable-shared \
+             --disable-autodetect
 config*:
 replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
 # sed -i bak -E '/HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d' config.h
@@ -34,20 +24,11 @@ replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
 config_unix32.h:
 add to configure command: --disable-asm --disable-x86asm --cc='clang -m32'
 
-config_android32.h:
-./configure --disable-everything --disable-protocols --disable-demuxers \
-            --disable-muxers --disable-filters --disable-programs \
-            --disable-doc --disable-parsers --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-vdpau --disable-videotoolbox \
-            --enable-decoder=flac --disable-asm --disable-cuvid --disable-cuda \
-            --cross-prefix=~/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi- \
-            --target-os=linux --arch=arm --enable-cross-compile \
-            --sysroot=~/.mozbuild/android-ndk-r15c/platforms/android-24/arch-arm \
-            --enable-decoder=mp3
+config_android32.h: Only mp3 and flac are enabled on this platform.
+./configure --disable-all --enable-avcodec --enable-decoder=mp3,flac \
+            --disable-static --enable-shared --disable-autodetect \
+            --enable-small --target-os=linux --arch=arm --enable-cross-compile \
+            --cc=$HOME/.mozbuild/android-ndk-r20/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi16-clang
 
 config_unix32.h/config_unix64.h/config_unix64.asm:
 replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
@@ -55,6 +36,12 @@ replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
 config_win{32|64}.{h|asm}:
 add to configure command: --toolchain=msvc
 
+config_aarch64_win64.h: You will need to install cpp (either using msys or wsl)
+./configure --disable-all --enable-avcodec --enable-decoder=vp8,vp9,mp3,flac \
+            --enable-parser=vp8,vp9 --disable-static --enable-shared \
+            --disable-autodetect  --toolchain=msvc --enable-cross-compile \
+            --target-os=win32 --arch=arm64
+
 Regenerate defaults_disabled.{h,asm} with:
 $ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.h | sort -d -u > ~/Work/Mozilla/mozilla-central/media/ffvpx/defaults_disabled.h
 $ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|PROTOCOL|ENCODERS|DECODERS|HWACCELS|INDEVS|OUTDEVS|FILTERS|DEMUXERS|MUXERS|PROTOCOLS|BSF) 0" config.asm | sort -d -u > ~/Work/Mozilla/mozilla-central/media/ffvpx/defaults_disabled.asm

media/ffvpx/config_aarch64_win64.h

@@ -1,15 +1,15 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --toolchain=msvc --disable-cuda --disable-cuvid --enable-decoder=mp3"
+#define FFMPEG_CONFIGURATION "--disable-all --enable-avcodec --enable-parser='vp8,vp9' --enable-decoder='vp8,vp9,mp3,flac' --disable-static --enable-shared --disable-autodetect --toolchain=msvc --enable-cross-compile --target-os=win32 --arch=arm64"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.15.26726 for x64"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.24.28315 for ARM64"
 #define av_restrict __restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -41,9 +41,9 @@
 #define HAVE_ARMV5TE 0
 #define HAVE_ARMV6 0
 #define HAVE_ARMV6T2 0
-#define HAVE_ARMV8 0
-#define HAVE_NEON 0
-#define HAVE_VFP 0
+#define HAVE_ARMV8 1
+#define HAVE_NEON 1
+#define HAVE_VFP 1
 #define HAVE_VFPV3 0
 #define HAVE_SETEND 0
 #define HAVE_ALTIVEC 0
@@ -55,22 +55,22 @@
 #define HAVE_AESNI 0
 #define HAVE_AMD3DNOW 0
 #define HAVE_AMD3DNOWEXT 0
-#define HAVE_AVX 1
-#define HAVE_AVX2 1
-#define HAVE_AVX512 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
-#define HAVE_SSE42 1
-#define HAVE_SSSE3 1
-#define HAVE_XOP 1
+#define HAVE_AVX 0
+#define HAVE_AVX2 0
+#define HAVE_AVX512 0
+#define HAVE_FMA3 0
+#define HAVE_FMA4 0
+#define HAVE_MMX 0
+#define HAVE_MMXEXT 0
+#define HAVE_SSE 0
+#define HAVE_SSE2 0
+#define HAVE_SSE3 0
+#define HAVE_SSE4 0
+#define HAVE_SSE42 0
+#define HAVE_SSSE3 0
+#define HAVE_XOP 0
 #define HAVE_CPUNOP 0
-#define HAVE_I686 1
+#define HAVE_I686 0
 #define HAVE_MIPSFPU 0
 #define HAVE_MIPS32R2 0
 #define HAVE_MIPS32R5 0
@@ -80,15 +80,16 @@
 #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
 #define HAVE_ARMV5TE_EXTERNAL 0
 #define HAVE_ARMV6_EXTERNAL 0
 #define HAVE_ARMV6T2_EXTERNAL 0
-#define HAVE_ARMV8_EXTERNAL 0
-#define HAVE_NEON_EXTERNAL 0
-#define HAVE_VFP_EXTERNAL 0
+#define HAVE_ARMV8_EXTERNAL 1
+#define HAVE_NEON_EXTERNAL 1
+#define HAVE_VFP_EXTERNAL 1
 #define HAVE_VFPV3_EXTERNAL 0
 #define HAVE_SETEND_EXTERNAL 0
 #define HAVE_ALTIVEC_EXTERNAL 0
@@ -105,7 +106,7 @@
 #define HAVE_AVX512_EXTERNAL 0
 #define HAVE_FMA3_EXTERNAL 0
 #define HAVE_FMA4_EXTERNAL 0
-#define HAVE_MMX_EXTERNAL 0 
+#define HAVE_MMX_EXTERNAL 0
 #define HAVE_MMXEXT_EXTERNAL 0
 #define HAVE_SSE_EXTERNAL 0
 #define HAVE_SSE2_EXTERNAL 0
@@ -125,6 +126,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
@@ -132,7 +134,7 @@
 #define HAVE_ARMV6_INLINE 0
 #define HAVE_ARMV6T2_INLINE 0
 #define HAVE_ARMV8_INLINE 0
-#define HAVE_NEON_INLINE 1
+#define HAVE_NEON_INLINE 0
 #define HAVE_VFP_INLINE 0
 #define HAVE_VFPV3_INLINE 0
 #define HAVE_SETEND_INLINE 0
@@ -170,22 +172,23 @@
 #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
 #define HAVE_ALIGNED_STACK 1
 #define HAVE_FAST_64BIT 1
 #define HAVE_FAST_CLZ 0
-#define HAVE_FAST_CMOV 1
-#define HAVE_LOCAL_ALIGNED 1
+#define HAVE_FAST_CMOV 0
+#define HAVE_LOCAL_ALIGNED 0
 #define HAVE_SIMD_ALIGN_16 1
-#define HAVE_SIMD_ALIGN_32 1
-#define HAVE_SIMD_ALIGN_64 1
+#define HAVE_SIMD_ALIGN_32 0
+#define HAVE_SIMD_ALIGN_64 0
 #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_RDTSC 0
 #define HAVE_SEM_TIMEDWAIT 0
 #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 #define HAVE_CABS 0
@@ -232,7 +235,7 @@
 #define HAVE_VALGRIND_VALGRIND_H 0
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 1
-#define HAVE_INTRINSICS_NEON 0
+#define HAVE_INTRINSICS_NEON 1
 #define HAVE_ATANF 1
 #define HAVE_ATAN2F 1
 #define HAVE_CBRT 1
@@ -324,7 +327,7 @@
 #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_FUNC 1
 #define HAVE_AS_OBJECT_ARCH 0
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_BLOCKS_EXTENSION 0
@@ -337,13 +340,14 @@
 #define HAVE_INLINE_ASM_LABELS 0
 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
 #define HAVE_PRAGMA_DEPRECATED 1
-#define HAVE_RSYNC_CONTIMEOUT 0
+#define HAVE_RSYNC_CONTIMEOUT 1
 #define HAVE_SYMVER_ASM_LABEL 0
 #define HAVE_SYMVER_GNU_ASM 0
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
 #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
@@ -358,7 +362,7 @@
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-#define HAVE_MAKEINFO 1
+#define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
 #define HAVE_OPENCL_D3D11 0
 #define HAVE_OPENCL_DRM_ARM 0
@@ -373,7 +377,7 @@
 #define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 1
 #define CONFIG_PODPAGES 1
-#define CONFIG_TXTPAGES 1
+#define CONFIG_TXTPAGES 0
 #define CONFIG_AVIO_DIR_CMD_EXAMPLE 1
 #define CONFIG_AVIO_READING_EXAMPLE 1
 #define CONFIG_DECODE_AUDIO_EXAMPLE 1
@@ -406,13 +410,14 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -433,6 +438,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
@@ -444,6 +450,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
@@ -480,6 +487,7 @@
 #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 0
@@ -492,12 +500,13 @@
 #define CONFIG_LIBXCB_SHAPE 0
 #define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LZMA 0
-#define CONFIG_SCHANNEL 1
+#define CONFIG_SCHANNEL 0
 #define CONFIG_SDL2 0
 #define CONFIG_SECURETRANSPORT 0
 #define CONFIG_SNDIO 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_CUDA_NVCC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 0
@@ -508,6 +517,7 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #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
@@ -549,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -578,8 +588,10 @@
 #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
@@ -591,6 +603,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
@@ -639,6 +652,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
@@ -660,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_android32.h

@@ -80,6 +80,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
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -344,6 +347,7 @@
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
 #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
@@ -368,9 +372,9 @@
 #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
-#define HAVE_TEXI2HTML 1
+#define HAVE_TEXI2HTML 0
 #define CONFIG_DOC 0
-#define CONFIG_HTMLPAGES 1
+#define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 1
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 1
@@ -400,22 +404,26 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -430,6 +438,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
@@ -441,6 +450,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
@@ -460,6 +470,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
@@ -476,6 +487,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
@@ -493,6 +506,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
@@ -503,6 +517,7 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #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
@@ -527,15 +542,15 @@
 #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
@@ -550,7 +565,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
@@ -573,10 +588,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 0
@@ -632,6 +651,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
@@ -653,7 +673,7 @@
 #define CONFIG_VP8_DECODER 0
 #define CONFIG_VP9_DECODER 0
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 0
 #define CONFIG_VP9_PARSER 0
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_audio.h

@@ -80,6 +80,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
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -344,6 +347,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
@@ -400,22 +404,26 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -430,6 +438,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
@@ -441,6 +450,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
@@ -460,6 +470,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
@@ -476,6 +487,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
@@ -493,6 +506,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
@@ -503,6 +517,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
@@ -527,15 +542,15 @@
 #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
@@ -544,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 0
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -566,16 +581,21 @@
 #define CONFIG_PARSERS 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_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 0
@@ -583,6 +603,7 @@
 #define CONFIG_FDCTDSP 0
 #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
@@ -631,6 +652,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
@@ -651,8 +673,8 @@
 #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
 #define CONFIG_VP8_DECODER 0
 #define CONFIG_VP9_DECODER 0
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_FLAC_DECODER 1
 #define CONFIG_VP8_PARSER 0
 #define CONFIG_VP9_PARSER 0
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_darwin64.asm

@@ -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
@@ -353,9 +357,9 @@
 %define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
 %define HAVE_PERL 1
 %define HAVE_POD2MAN 1
-%define HAVE_TEXI2HTML 1
+%define HAVE_TEXI2HTML 0
 %define CONFIG_DOC 0
-%define CONFIG_HTMLPAGES 1
+%define CONFIG_HTMLPAGES 0
 %define CONFIG_MANPAGES 1
 %define CONFIG_PODPAGES 1
 %define CONFIG_TXTPAGES 1
@@ -385,22 +389,26 @@
 %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
 %define CONFIG_LIBFDK_AAC 0
 %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 +423,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 +435,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 +455,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 +472,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
@@ -476,8 +489,9 @@
 %define CONFIG_SDL2 0
 %define CONFIG_SECURETRANSPORT 0
 %define CONFIG_SNDIO 0
-%define CONFIG_XLIB 1
+%define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
+%define CONFIG_CUDA_NVCC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 0
@@ -488,6 +502,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,15 +527,15 @@
 %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
@@ -529,13 +544,13 @@
 %define CONFIG_ERROR_RESILIENCE 0
 %define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
-%define CONFIG_FFT 0
+%define CONFIG_FFT 1
 %define CONFIG_LSP 0
 %define CONFIG_LZO 0
 %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 +573,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 +588,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 +637,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,6 +659,6 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
+%define CONFIG_MP3_DECODER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
-%define CONFIG_MP3_DECODER 1

media/ffvpx/config_darwin64.h

@@ -3,10 +3,10 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --disable-cuda --disable-cuvid --enable-decoder=mp3"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Apple LLVM version 9.1.0 (clang-902.0.39.2)"
+#define CC_IDENT "Apple clang version 11.0.0 (clang-1100.0.33.17)"
 #define av_restrict restrict
 #define EXTERN_PREFIX "_"
 #define EXTERN_ASM _
@@ -80,6 +80,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
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -344,6 +347,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
@@ -368,9 +372,9 @@
 #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
 #define HAVE_PERL 1
 #define HAVE_POD2MAN 1
-#define HAVE_TEXI2HTML 1
+#define HAVE_TEXI2HTML 0
 #define CONFIG_DOC 0
-#define CONFIG_HTMLPAGES 1
+#define CONFIG_HTMLPAGES 0
 #define CONFIG_MANPAGES 1
 #define CONFIG_PODPAGES 1
 #define CONFIG_TXTPAGES 1
@@ -400,22 +404,26 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -430,6 +438,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
@@ -441,6 +450,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
@@ -460,6 +470,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
@@ -476,6 +487,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
@@ -491,8 +504,9 @@
 #define CONFIG_SDL2 0
 #define CONFIG_SECURETRANSPORT 0
 #define CONFIG_SNDIO 0
-#define CONFIG_XLIB 1
+#define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
+#define CONFIG_CUDA_NVCC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 0
@@ -503,6 +517,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
@@ -527,15 +542,15 @@
 #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
@@ -544,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -573,10 +588,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
@@ -584,6 +603,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
@@ -632,6 +652,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
@@ -653,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_unix32.h

@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --disable-asm --disable-x86asm --disable-cuda --disable-cuvid --enable-decoder=mp3"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
 #define CC_IDENT "gcc 6.3.0 (Ubuntu 6.3.0-12ubuntu2) 20170406"
@@ -80,6 +80,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
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -344,6 +347,7 @@
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
 #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
@@ -400,22 +404,26 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -430,6 +438,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
@@ -441,6 +450,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
@@ -460,6 +470,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
@@ -476,6 +487,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
@@ -493,6 +506,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
@@ -503,6 +517,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
@@ -527,15 +542,15 @@
 #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
@@ -544,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 0
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -573,10 +588,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 0
@@ -584,6 +603,7 @@
 #define CONFIG_FDCTDSP 0
 #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
@@ -632,6 +652,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
@@ -653,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_unix64.asm

@@ -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,15 +528,15 @@
 %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
@@ -529,13 +545,13 @@
 %define CONFIG_ERROR_RESILIENCE 0
 %define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
-%define CONFIG_FFT 0
+%define CONFIG_FFT 1
 %define CONFIG_LSP 0
 %define CONFIG_LZO 0
 %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,6 +660,6 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
+%define CONFIG_MP3_DECODER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
-%define CONFIG_MP3_DECODER 1

media/ffvpx/config_unix64.h

@@ -3,7 +3,7 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --disable-cuda --disable-cuvid --enable-decoder=mp3"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
 #define CC_IDENT "gcc 6.3.0 (Ubuntu 6.3.0-12ubuntu2) 20170406"
@@ -80,6 +80,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
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -344,6 +347,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
@@ -400,22 +404,26 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -430,6 +438,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
@@ -441,6 +450,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
@@ -460,6 +470,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
@@ -476,6 +487,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
@@ -493,6 +506,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
@@ -503,6 +517,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
@@ -527,15 +542,15 @@
 #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
@@ -544,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -573,10 +588,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
@@ -584,6 +603,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
@@ -632,6 +652,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
@@ -653,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_win32.asm

@@ -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
@@ -87,7 +88,7 @@
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
 %define HAVE_AVX2_EXTERNAL 1
-%define HAVE_AVX512_EXTERNAL 0
+%define HAVE_AVX512_EXTERNAL 1
 %define HAVE_FMA3_EXTERNAL 1
 %define HAVE_FMA4_EXTERNAL 1
 %define HAVE_MMX_EXTERNAL 1
@@ -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
@@ -322,13 +325,14 @@
 %define HAVE_INLINE_ASM_LABELS 0
 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
 %define HAVE_PRAGMA_DEPRECATED 1
-%define HAVE_RSYNC_CONTIMEOUT 0
+%define HAVE_RSYNC_CONTIMEOUT 1
 %define HAVE_SYMVER_ASM_LABEL 0
 %define HAVE_SYMVER_GNU_ASM 0
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
 %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
@@ -391,13 +395,14 @@
 %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
 %define CONFIG_LIBFDK_AAC 0
 %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
@@ -418,6 +423,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
@@ -429,6 +435,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
@@ -465,6 +472,7 @@
 %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 0
@@ -483,6 +491,7 @@
 %define CONFIG_SNDIO 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_CUDA_NVCC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 0
@@ -493,6 +502,7 @@
 %define CONFIG_AUDIOTOOLBOX 0
 %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
@@ -534,13 +544,13 @@
 %define CONFIG_ERROR_RESILIENCE 0
 %define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
-%define CONFIG_FFT 0
+%define CONFIG_FFT 1
 %define CONFIG_LSP 0
 %define CONFIG_LZO 0
 %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
@@ -563,8 +573,10 @@
 %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
@@ -576,6 +588,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
@@ -624,6 +637,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
@@ -645,6 +659,6 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
+%define CONFIG_MP3_DECODER 1
 %define CONFIG_VP8_PARSER 1
 %define CONFIG_VP9_PARSER 1
-%define CONFIG_MP3_DECODER 1

media/ffvpx/config_win32.h

@@ -3,10 +3,10 @@
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --disable-cuda --disable-cuvid --enable-decoder=mp3 --toolchain=msvc"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.15.26726 for x86"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.24.28315 for x86"
 #define av_restrict __restrict
 #define EXTERN_PREFIX "_"
 #define EXTERN_ASM _
@@ -80,6 +80,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
@@ -102,7 +103,7 @@
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
 #define HAVE_AVX2_EXTERNAL 1
-#define HAVE_AVX512_EXTERNAL 0
+#define HAVE_AVX512_EXTERNAL 1
 #define HAVE_FMA3_EXTERNAL 1
 #define HAVE_FMA4_EXTERNAL 1
 #define HAVE_MMX_EXTERNAL 1
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -337,13 +340,14 @@
 #define HAVE_INLINE_ASM_LABELS 0
 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
 #define HAVE_PRAGMA_DEPRECATED 1
-#define HAVE_RSYNC_CONTIMEOUT 0
+#define HAVE_RSYNC_CONTIMEOUT 1
 #define HAVE_SYMVER_ASM_LABEL 0
 #define HAVE_SYMVER_GNU_ASM 0
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
 #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
@@ -406,13 +410,14 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -433,6 +438,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
@@ -444,6 +450,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
@@ -480,6 +487,7 @@
 #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 0
@@ -498,6 +506,7 @@
 #define CONFIG_SNDIO 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_CUDA_NVCC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 0
@@ -508,6 +517,7 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #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
@@ -549,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -578,8 +588,10 @@
 #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
@@ -591,6 +603,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
@@ -639,6 +652,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
@@ -660,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/config_win64.asm

@@ -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
@@ -87,7 +88,7 @@
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
 %define HAVE_AVX_EXTERNAL 1
 %define HAVE_AVX2_EXTERNAL 1
-%define HAVE_AVX512_EXTERNAL 0
+%define HAVE_AVX512_EXTERNAL 1
 %define HAVE_FMA3_EXTERNAL 1
 %define HAVE_FMA4_EXTERNAL 1
 %define HAVE_MMX_EXTERNAL 1
@@ -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
@@ -322,13 +325,14 @@
 %define HAVE_INLINE_ASM_LABELS 0
 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
 %define HAVE_PRAGMA_DEPRECATED 1
-%define HAVE_RSYNC_CONTIMEOUT 0
+%define HAVE_RSYNC_CONTIMEOUT 1
 %define HAVE_SYMVER_ASM_LABEL 0
 %define HAVE_SYMVER_GNU_ASM 0
 %define HAVE_VFP_ARGS 0
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 0
 %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
@@ -391,13 +395,14 @@
 %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
 %define CONFIG_LIBFDK_AAC 0
 %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
@@ -418,6 +423,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
@@ -429,6 +435,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
@@ -465,6 +472,7 @@
 %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 0
@@ -483,6 +491,7 @@
 %define CONFIG_SNDIO 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 0
+%define CONFIG_CUDA_NVCC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 0
@@ -493,6 +502,7 @@
 %define CONFIG_AUDIOTOOLBOX 0
 %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
@@ -534,13 +544,13 @@
 %define CONFIG_ERROR_RESILIENCE 0
 %define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
-%define CONFIG_FFT 0
+%define CONFIG_FFT 1
 %define CONFIG_LSP 0
 %define CONFIG_LZO 0
 %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
@@ -563,8 +573,10 @@
 %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
@@ -576,6 +588,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
@@ -624,6 +637,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
@@ -645,6 +659,6 @@
 %define CONFIG_VP8_DECODER 1
 %define CONFIG_VP9_DECODER 1
 %define CONFIG_FLAC_DECODER 1
-%define CONFIG_VP8_PARSER 1
-%define CONFIG_VP9_PARSER 1
 %define CONFIG_MP3_DECODER 1
+%define CONFIG_VP8_PARSER 1
+%define CONFIG_VP9_PARSER 1

media/ffvpx/config_win64.h

@@ -1,15 +1,15 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --toolchain=msvc --disable-cuda --disable-cuvid --enable-decoder=mp3"
+#define FFMPEG_CONFIGURATION "--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-vdpau --disable-videotoolbox --enable-decoder=flac --enable-asm --enable-x86asm --disable-cuda --disable-cuvid --enable-decoder=mp3 --toolchain=msvc"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-#define CONFIG_THIS_YEAR 2018
+#define CONFIG_THIS_YEAR 2019
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
 #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.15.26726 for x64"
+#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.24.28315 for x64"
 #define av_restrict __restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -80,6 +80,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
@@ -102,7 +103,7 @@
 #define HAVE_AMD3DNOWEXT_EXTERNAL 1
 #define HAVE_AVX_EXTERNAL 1
 #define HAVE_AVX2_EXTERNAL 1
-#define HAVE_AVX512_EXTERNAL 0
+#define HAVE_AVX512_EXTERNAL 1
 #define HAVE_FMA3_EXTERNAL 1
 #define HAVE_FMA4_EXTERNAL 1
 #define HAVE_MMX_EXTERNAL 1
@@ -125,6 +126,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
@@ -170,6 +172,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
@@ -337,13 +340,14 @@
 #define HAVE_INLINE_ASM_LABELS 0
 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 0
 #define HAVE_PRAGMA_DEPRECATED 1
-#define HAVE_RSYNC_CONTIMEOUT 0
+#define HAVE_RSYNC_CONTIMEOUT 1
 #define HAVE_SYMVER_ASM_LABEL 0
 #define HAVE_SYMVER_GNU_ASM 0
 #define HAVE_VFP_ARGS 0
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 0
 #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
@@ -406,13 +410,14 @@
 #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
 #define CONFIG_LIBFDK_AAC 0
 #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
@@ -433,6 +438,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
@@ -444,6 +450,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
@@ -480,6 +487,7 @@
 #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 0
@@ -498,6 +506,7 @@
 #define CONFIG_SNDIO 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 0
+#define CONFIG_CUDA_NVCC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 0
@@ -508,6 +517,7 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #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
@@ -549,13 +559,13 @@
 #define CONFIG_ERROR_RESILIENCE 0
 #define CONFIG_FAAN 1
 #define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_FFT 0
+#define CONFIG_FFT 1
 #define CONFIG_LSP 0
 #define CONFIG_LZO 0
 #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
@@ -578,8 +588,10 @@
 #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
@@ -591,6 +603,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
@@ -639,6 +652,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
@@ -660,7 +674,7 @@
 #define CONFIG_VP8_DECODER 1
 #define CONFIG_VP9_DECODER 1
 #define CONFIG_FLAC_DECODER 1
+#define CONFIG_MP3_DECODER 1
 #define CONFIG_VP8_PARSER 1
 #define CONFIG_VP9_PARSER 1
-#define CONFIG_MP3_DECODER 1
 #endif /* FFMPEG_CONFIG_H */

media/ffvpx/defaults_disabled.asm

@@ -28,14 +28,20 @@
 %define CONFIG_ACONTRAST_FILTER 0
 %define CONFIG_ACOPY_FILTER 0
 %define CONFIG_ACROSSFADE_FILTER 0
+%define CONFIG_ACROSSOVER_FILTER 0
 %define CONFIG_ACRUSHER_FILTER 0
 %define CONFIG_ACT_DEMUXER 0
+%define CONFIG_ACUE_FILTER 0
+%define CONFIG_ADECLICK_FILTER 0
+%define CONFIG_ADECLIP_FILTER 0
 %define CONFIG_ADELAY_FILTER 0
+%define CONFIG_ADERIVATIVE_FILTER 0
 %define CONFIG_ADF_DEMUXER 0
 %define CONFIG_ADPCM_4XM_DECODER 0
 %define CONFIG_ADPCM_ADX_DECODER 0
 %define CONFIG_ADPCM_ADX_ENCODER 0
 %define CONFIG_ADPCM_AFC_DECODER 0
+%define CONFIG_ADPCM_AGM_DECODER 0
 %define CONFIG_ADPCM_AICA_DECODER 0
 %define CONFIG_ADPCM_CT_DECODER 0
 %define CONFIG_ADPCM_DTK_DECODER 0
@@ -97,16 +103,20 @@
 %define CONFIG_AEVALSRC_FILTER 0
 %define CONFIG_AFADE_FILTER 0
 %define CONFIG_AFC_DEMUXER 0
+%define CONFIG_AFFTDN_FILTER 0
 %define CONFIG_AFFTFILT_FILTER 0
 %define CONFIG_AFIFO_FILTER 0
 %define CONFIG_AFIR_FILTER 0
 %define CONFIG_AFORMAT_FILTER 0
 %define CONFIG_AGATE_FILTER 0
+%define CONFIG_AGM_DECODER 0
+%define CONFIG_AGRAPHMONITOR_FILTER 0
 %define CONFIG_AHISTOGRAM_FILTER 0
 %define CONFIG_AIC_DECODER 0
 %define CONFIG_AIFF_DEMUXER 0
 %define CONFIG_AIFF_MUXER 0
 %define CONFIG_AIIR_FILTER 0
+%define CONFIG_AINTEGRAL_FILTER 0
 %define CONFIG_AINTERLEAVE_FILTER 0
 %define CONFIG_AIX_DEMUXER 0
 %define CONFIG_ALAC_AT_DECODER 0
@@ -129,6 +139,7 @@
 %define CONFIG_AMETADATA_FILTER 0
 %define CONFIG_AMIX_FILTER 0
 %define CONFIG_AMOVIE_FILTER 0
+%define CONFIG_AMPLIFY_FILTER 0
 %define CONFIG_AMR_DEMUXER 0
 %define CONFIG_AMR_MUXER 0
 %define CONFIG_AMR_NB_AT_DECODER 0
@@ -136,10 +147,12 @@
 %define CONFIG_AMRNB_DEMUXER 0
 %define CONFIG_AMRWB_DECODER 0
 %define CONFIG_AMRWB_DEMUXER 0
+%define CONFIG_AMULTIPLY_FILTER 0
 %define CONFIG_AMV_DECODER 0
 %define CONFIG_AMV_ENCODER 0
 %define CONFIG_ANDROID_CAMERA_INDEV 0
 %define CONFIG_ANEQUALIZER_FILTER 0
+%define CONFIG_ANLMDN_FILTER 0
 %define CONFIG_ANM_DECODER 0
 %define CONFIG_ANM_DEMUXER 0
 %define CONFIG_ANOISESRC_FILTER 0
@@ -168,6 +181,7 @@
 %define CONFIG_APTX_MUXER 0
 %define CONFIG_APULSATOR_FILTER 0
 %define CONFIG_AQTITLE_DEMUXER 0
+%define CONFIG_ARBC_DECODER 0
 %define CONFIG_AREALTIME_FILTER 0
 %define CONFIG_ARESAMPLE_FILTER 0
 %define CONFIG_AREVERSE_FILTER 0
@@ -183,7 +197,9 @@
 %define CONFIG_ASF_STREAM_MUXER 0
 %define CONFIG_ASHOWINFO_FILTER 0
 %define CONFIG_ASIDEDATA_FILTER 0
+%define CONFIG_ASOFTCLIP_FILTER 0
 %define CONFIG_ASPLIT_FILTER 0
+%define CONFIG_ASR_FILTER 0
 %define CONFIG_ASS_DECODER 0
 %define CONFIG_ASS_DEMUXER 0
 %define CONFIG_ASS_ENCODER 0
@@ -205,11 +221,15 @@
 %define CONFIG_ATRAC3_DECODER 0
 %define CONFIG_ATRAC3PAL_DECODER 0
 %define CONFIG_ATRAC3P_DECODER 0
+%define CONFIG_ATRAC9_DECODER 0
 %define CONFIG_ATRIM_FILTER 0
 %define CONFIG_AU_DEMUXER 0
 %define CONFIG_AU_MUXER 0
 %define CONFIG_AURA2_DECODER 0
 %define CONFIG_AURA_DECODER 0
+%define CONFIG_AV1_FRAME_SPLIT_BSF 0
+%define CONFIG_AV1_METADATA_BSF 0
+%define CONFIG_AV1_PARSER 0
 %define CONFIG_AVECTORSCOPE_FILTER 0
 %define CONFIG_AVFOUNDATION_INDEV 0
 %define CONFIG_AVGBLUR_FILTER 0
@@ -222,6 +242,9 @@
 %define CONFIG_AVRN_DECODER 0
 %define CONFIG_AVRP_DECODER 0
 %define CONFIG_AVRP_ENCODER 0
+%define CONFIG_AVS2_DEMUXER 0
+%define CONFIG_AVS2_MUXER 0
+%define CONFIG_AVS2_PARSER 0
 %define CONFIG_AVS_DECODER 0
 %define CONFIG_AVS_DEMUXER 0
 %define CONFIG_AVUI_DECODER 0
@@ -255,6 +278,7 @@
 %define CONFIG_BLACKFRAME_FILTER 0
 %define CONFIG_BLEND_FILTER 0
 %define CONFIG_BLURAY_PROTOCOL 0
+%define CONFIG_BM3D_FILTER 0
 %define CONFIG_BMP_DECODER 0
 %define CONFIG_BMP_ENCODER 0
 %define CONFIG_BMP_PARSER 0
@@ -263,6 +287,7 @@
 %define CONFIG_BMV_VIDEO_DECODER 0
 %define CONFIG_BOA_DEMUXER 0
 %define CONFIG_BOXBLUR_FILTER 0
+%define CONFIG_BOXBLUR_OPENCL_FILTER 0
 %define CONFIG_BRENDER_PIX_DECODER 0
 %define CONFIG_BRSTM_DEMUXER 0
 %define CONFIG_BS2B_FILTER 0
@@ -288,8 +313,10 @@
 %define CONFIG_CHANNELSPLIT_FILTER 0
 %define CONFIG_CHOMP_BSF 0
 %define CONFIG_CHORUS_FILTER 0
+%define CONFIG_CHROMAHOLD_FILTER 0
 %define CONFIG_CHROMAKEY_FILTER 0
 %define CONFIG_CHROMAPRINT_MUXER 0
+%define CONFIG_CHROMASHIFT_FILTER 0
 %define CONFIG_CIESCOPE_FILTER 0
 %define CONFIG_CINE_DEMUXER 0
 %define CONFIG_CINEPAK_DECODER 0
@@ -306,7 +333,9 @@
 %define CONFIG_COLORBALANCE_FILTER 0
 %define CONFIG_COLORCHANNELMIXER_FILTER 0
 %define CONFIG_COLOR_FILTER 0
+%define CONFIG_COLORHOLD_FILTER 0
 %define CONFIG_COLORKEY_FILTER 0
+%define CONFIG_COLORKEY_OPENCL_FILTER 0
 %define CONFIG_COLORLEVELS_FILTER 0
 %define CONFIG_COLORMATRIX_FILTER 0
 %define CONFIG_COLORSPACE_FILTER 0
@@ -334,6 +363,7 @@
 %define CONFIG_CRYPTO_PROTOCOL 0
 %define CONFIG_CRYSTALIZER_FILTER 0
 %define CONFIG_CSCD_DECODER 0
+%define CONFIG_CUE_FILTER 0
 %define CONFIG_CURVES_FILTER 0
 %define CONFIG_CYUV_DECODER 0
 %define CONFIG_DASH_DEMUXER 0
@@ -353,10 +383,13 @@
 %define CONFIG_DCTDNOIZ_FILTER 0
 %define CONFIG_DDS_DECODER 0
 %define CONFIG_DEBAND_FILTER 0
+%define CONFIG_DEBLOCK_FILTER 0
 %define CONFIG_DECIMATE_FILTER 0
 %define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_DECKLINK_OUTDEV 0
 %define CONFIG_DECONVOLVE_FILTER 0
+%define CONFIG_DEDOT_FILTER 0
+%define CONFIG_DEESSER_FILTER 0
 %define CONFIG_DEFLATE_FILTER 0
 %define CONFIG_DEFLICKER_FILTER 0
 %define CONFIG_DEINTERLACE_QSV_FILTER 0
@@ -365,12 +398,15 @@
 %define CONFIG_DELOGO_FILTER 0
 %define CONFIG_DEMUXERS 0
 %define CONFIG_DENOISE_VAAPI_FILTER 0
+%define CONFIG_DERAIN_FILTER 0
 %define CONFIG_DESHAKE_FILTER 0
 %define CONFIG_DESPILL_FILTER 0
 %define CONFIG_DETELECINE_FILTER 0
 %define CONFIG_DFA_DECODER 0
 %define CONFIG_DFA_DEMUXER 0
+%define CONFIG_DHAV_DEMUXER 0
 %define CONFIG_DILATION_FILTER 0
+%define CONFIG_DILATION_OPENCL_FILTER 0
 %define CONFIG_DIRAC_DECODER 0
 %define CONFIG_DIRAC_DEMUXER 0
 %define CONFIG_DIRAC_MUXER 0
@@ -453,6 +489,7 @@
 %define CONFIG_EQ_FILTER 0
 %define CONFIG_EQUALIZER_FILTER 0
 %define CONFIG_EROSION_FILTER 0
+%define CONFIG_EROSION_OPENCL_FILTER 0
 %define CONFIG_ESCAPE124_DECODER 0
 %define CONFIG_ESCAPE130_DECODER 0
 %define CONFIG_EVRC_DECODER 0
@@ -468,6 +505,7 @@
 %define CONFIG_FFMETADATA_MUXER 0
 %define CONFIG_FFRTMPCRYPT_PROTOCOL 0
 %define CONFIG_FFRTMPHTTP_PROTOCOL 0
+%define CONFIG_FFTDNOIZ_FILTER 0
 %define CONFIG_FFTFILT_FILTER 0
 %define CONFIG_FFV1_DECODER 0
 %define CONFIG_FFV1_ENCODER 0
@@ -524,6 +562,7 @@
 %define CONFIG_FRAMESTEP_FILTER 0
 %define CONFIG_FRAME_THREAD_ENCODER 0
 %define CONFIG_FRAPS_DECODER 0
+%define CONFIG_FREEZEDETECT_FILTER 0
 %define CONFIG_FREI0R_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
 %define CONFIG_FRM_DEMUXER 0
@@ -538,6 +577,7 @@
 %define CONFIG_G723_1_DEMUXER 0
 %define CONFIG_G723_1_ENCODER 0
 %define CONFIG_G723_1_MUXER 0
+%define CONFIG_G723_1_PARSER 0
 %define CONFIG_G726_DEMUXER 0
 %define CONFIG_G726LE_DEMUXER 0
 %define CONFIG_G726LE_MUXER 0
@@ -555,9 +595,12 @@
 %define CONFIG_GIF_DEMUXER 0
 %define CONFIG_GIF_ENCODER 0
 %define CONFIG_GIF_MUXER 0
+%define CONFIG_GIF_PARSER 0
 %define CONFIG_GOPHER_PROTOCOL 0
 %define CONFIG_GRADFUN_FILTER 0
+%define CONFIG_GRAPHMONITOR_FILTER 0
 %define CONFIG_GREMLIN_DPCM_DECODER 0
+%define CONFIG_GREYEDGE_FILTER 0
 %define CONFIG_GSM_DECODER 0
 %define CONFIG_GSM_DEMUXER 0
 %define CONFIG_GSM_MS_AT_DECODER 0
@@ -618,6 +661,8 @@
 %define CONFIG_HAP_ENCODER 0
 %define CONFIG_HAPQA_EXTRACT_BSF 0
 %define CONFIG_HASH_MUXER 0
+%define CONFIG_HCOM_DECODER 0
+%define CONFIG_HCOM_DEMUXER 0
 %define CONFIG_HDCD_FILTER 0
 %define CONFIG_HDS_MUXER 0
 %define CONFIG_HEADPHONE_FILTER 0
@@ -647,6 +692,7 @@
 %define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_HFLIP_FILTER 0
 %define CONFIG_HIGHPASS_FILTER 0
+%define CONFIG_HIGHSHELF_FILTER 0
 %define CONFIG_HILBERT_FILTER 0
 %define CONFIG_HISTEQ_FILTER 0
 %define CONFIG_HISTOGRAM_FILTER 0
@@ -671,6 +717,7 @@
 %define CONFIG_HWMAP_FILTER 0
 %define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HWUPLOAD_FILTER 0
+%define CONFIG_HYMT_DECODER 0
 %define CONFIG_HYSTERESIS_FILTER 0
 %define CONFIG_IAC_DECODER 0
 %define CONFIG_ICECAST_PROTOCOL 0
@@ -684,8 +731,10 @@
 %define CONFIG_IEC61883_INDEV 0
 %define CONFIG_IFF_DEMUXER 0
 %define CONFIG_IFF_ILBM_DECODER 0
+%define CONFIG_IFV_DEMUXER 0
 %define CONFIG_ILBC_AT_DECODER 0
 %define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_ILBC_DECODER 0
 %define CONFIG_ILBC_DEMUXER 0
 %define CONFIG_ILBC_MUXER 0
 %define CONFIG_IL_FILTER 0
@@ -699,6 +748,7 @@
 %define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
@@ -718,7 +768,9 @@
 %define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
 %define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
+%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
 %define CONFIG_IMC_DECODER 0
+%define CONFIG_IMM4_DECODER 0
 %define CONFIG_IMX_DUMP_HEADER_BSF 0
 %define CONFIG_INDEO2_DECODER 0
 %define CONFIG_INDEO3_DECODER 0
@@ -757,17 +809,23 @@
 %define CONFIG_KGV1_DECODER 0
 %define CONFIG_KMSGRAB_INDEV 0
 %define CONFIG_KMVC_DECODER 0
+%define CONFIG_KUX_DEMUXER 0
 %define CONFIG_LADSPA_FILTER 0
 %define CONFIG_LAGARITH_DECODER 0
+%define CONFIG_LAGFUN_FILTER 0
 %define CONFIG_LATM_MUXER 0
 %define CONFIG_LAVFI_INDEV 0
 %define CONFIG_LENSCORRECTION_FILTER 0
+%define CONFIG_LENSFUN_FILTER 0
 %define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_LIBAOM_AV1_ENCODER 0
+%define CONFIG_LIBARIBB24_DECODER 0
 %define CONFIG_LIBCDIO_INDEV 0
 %define CONFIG_LIBCELT_DECODER 0
 %define CONFIG_LIBCODEC2_DECODER 0
 %define CONFIG_LIBCODEC2_ENCODER 0
+%define CONFIG_LIBDAV1D_DECODER 0
+%define CONFIG_LIBDAVS2_DECODER 0
 %define CONFIG_LIBDC1394_INDEV 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -781,8 +839,6 @@
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_LIBMODPLUG_DEMUXER 0
 %define CONFIG_LIBMP3LAME_ENCODER 0
-%define CONFIG_LIBNDI_NEWTEK_INDEV 0
-%define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
 %define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
 %define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
 %define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
@@ -822,6 +878,7 @@
 %define CONFIG_LIBX264_ENCODER 0
 %define CONFIG_LIBX264RGB_ENCODER 0
 %define CONFIG_LIBX265_ENCODER 0
+%define CONFIG_LIBXAVS2_ENCODER 0
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 0
 %define CONFIG_LIBZVBI_TELETEXT_DECODER 0
@@ -835,9 +892,12 @@
 %define CONFIG_LOOP_FILTER 0
 %define CONFIG_LOUDNORM_FILTER 0
 %define CONFIG_LOWPASS_FILTER 0
+%define CONFIG_LOWSHELF_FILTER 0
 %define CONFIG_LRC_DEMUXER 0
 %define CONFIG_LRC_MUXER 0
+%define CONFIG_LSCR_DECODER 0
 %define CONFIG_LUMAKEY_FILTER 0
+%define CONFIG_LUT1D_FILTER 0
 %define CONFIG_LUT2_FILTER 0
 %define CONFIG_LUT3D_FILTER 0
 %define CONFIG_LUT_FILTER 0
@@ -856,6 +916,7 @@
 %define CONFIG_MANDELBROT_FILTER 0
 %define CONFIG_MASKEDCLAMP_FILTER 0
 %define CONFIG_MASKEDMERGE_FILTER 0
+%define CONFIG_MASKFUN_FILTER 0
 %define CONFIG_MATROSKA_AUDIO_MUXER 0
 %define CONFIG_MATROSKA_DEMUXER 0
 %define CONFIG_MATROSKA_MUXER 0
@@ -1021,6 +1082,7 @@
 %define CONFIG_MVC2_DECODER 0
 %define CONFIG_MV_DEMUXER 0
 %define CONFIG_MVI_DEMUXER 0
+%define CONFIG_MWSC_DECODER 0
 %define CONFIG_MXF_D10_MUXER 0
 %define CONFIG_MXF_DEMUXER 0
 %define CONFIG_MXF_MUXER 0
@@ -1033,6 +1095,7 @@
 %define CONFIG_NELLYMOSER_ENCODER 0
 %define CONFIG_NISTSPHERE_DEMUXER 0
 %define CONFIG_NLMEANS_FILTER 0
+%define CONFIG_NLMEANS_OPENCL_FILTER 0
 %define CONFIG_NNEDI_FILTER 0
 %define CONFIG_NOFORMAT_FILTER 0
 %define CONFIG_NOISE_BSF 0
@@ -1079,6 +1142,8 @@
 %define CONFIG_PAF_AUDIO_DECODER 0
 %define CONFIG_PAF_DEMUXER 0
 %define CONFIG_PAF_VIDEO_DECODER 0
+%define CONFIG_PAL100BARS_FILTER 0
+%define CONFIG_PAL75BARS_FILTER 0
 %define CONFIG_PALETTEGEN_FILTER 0
 %define CONFIG_PALETTEUSE_FILTER 0
 %define CONFIG_PAM_DECODER 0
@@ -1094,6 +1159,7 @@
 %define CONFIG_PCM_ALAW_MUXER 0
 %define CONFIG_PCM_BLURAY_DECODER 0
 %define CONFIG_PCM_DVD_DECODER 0
+%define CONFIG_PCM_DVD_ENCODER 0
 %define CONFIG_PCM_F16LE_DECODER 0
 %define CONFIG_PCM_F24LE_DECODER 0
 %define CONFIG_PCM_F32BE_DECODER 0
@@ -1191,6 +1257,10 @@
 %define CONFIG_PCM_U8_DEMUXER 0
 %define CONFIG_PCM_U8_ENCODER 0
 %define CONFIG_PCM_U8_MUXER 0
+%define CONFIG_PCM_VIDC_DECODER 0
+%define CONFIG_PCM_VIDC_DEMUXER 0
+%define CONFIG_PCM_VIDC_ENCODER 0
+%define CONFIG_PCM_VIDC_MUXER 0
 %define CONFIG_PCM_ZORK_DECODER 0
 %define CONFIG_PCX_DECODER 0
 %define CONFIG_PCX_ENCODER 0
@@ -1220,6 +1290,7 @@
 %define CONFIG_PPM_ENCODER 0
 %define CONFIG_PREMULTIPLY_FILTER 0
 %define CONFIG_PREWITT_FILTER 0
+%define CONFIG_PREWITT_OPENCL_FILTER 0
 %define CONFIG_PROCAMP_VAAPI_FILTER 0
 %define CONFIG_PROGRAM_OPENCL_FILTER 0
 %define CONFIG_PROMPEG_PROTOCOL 0
@@ -1227,7 +1298,8 @@
 %define CONFIG_PRORES_DECODER 0
 %define CONFIG_PRORES_ENCODER 0
 %define CONFIG_PRORES_KS_ENCODER 0
-%define CONFIG_PRORES_LGPL_DECODER 0
+%define CONFIG_PRORES_METADATA_BSF 0
+%define CONFIG_PROSUMER_DECODER 0
 %define CONFIG_PROTOCOLS 0
 %define CONFIG_PSD_DECODER 0
 %define CONFIG_PSEUDOCOLOR_FILTER 0
@@ -1260,6 +1332,7 @@
 %define CONFIG_RA_288_DECODER 0
 %define CONFIG_RALF_DECODER 0
 %define CONFIG_RANDOM_FILTER 0
+%define CONFIG_RASC_DECODER 0
 %define CONFIG_RAWVIDEO_DECODER 0
 %define CONFIG_RAWVIDEO_DEMUXER 0
 %define CONFIG_RAWVIDEO_ENCODER 0
@@ -1278,12 +1351,14 @@
 %define CONFIG_REPLAYGAIN_FILTER 0
 %define CONFIG_RESAMPLE_FILTER 0
 %define CONFIG_REVERSE_FILTER 0
+%define CONFIG_RGBASHIFT_FILTER 0
 %define CONFIG_RGBTESTSRC_FILTER 0
 %define CONFIG_RL2_DECODER 0
 %define CONFIG_RL2_DEMUXER 0
 %define CONFIG_RM_DEMUXER 0
 %define CONFIG_RM_MUXER 0
 %define CONFIG_ROBERTS_FILTER 0
+%define CONFIG_ROBERTS_OPENCL_FILTER 0
 %define CONFIG_ROQ_DECODER 0
 %define CONFIG_ROQ_DEMUXER 0
 %define CONFIG_ROQ_DPCM_DECODER 0
@@ -1357,8 +1432,10 @@
 %define CONFIG_SELECTIVECOLOR_FILTER 0
 %define CONFIG_SENDCMD_FILTER 0
 %define CONFIG_SEPARATEFIELDS_FILTER 0
+%define CONFIG_SER_DEMUXER 0
 %define CONFIG_SETDAR_FILTER 0
 %define CONFIG_SETFIELD_FILTER 0
+%define CONFIG_SETPARAMS_FILTER 0
 %define CONFIG_SETPTS_FILTER 0
 %define CONFIG_SETRANGE_FILTER 0
 %define CONFIG_SETSAR_FILTER 0
@@ -1374,6 +1451,7 @@
 %define CONFIG_SHOWFREQS_FILTER 0
 %define CONFIG_SHOWINFO_FILTER 0
 %define CONFIG_SHOWPALETTE_FILTER 0
+%define CONFIG_SHOWSPATIAL_FILTER 0
 %define CONFIG_SHOWSPECTRUM_FILTER 0
 %define CONFIG_SHOWSPECTRUMPIC_FILTER 0
 %define CONFIG_SHOWVOLUME_FILTER 0
@@ -1389,6 +1467,7 @@
 %define CONFIG_SIGNATURE_FILTER 0
 %define CONFIG_SILENCEDETECT_FILTER 0
 %define CONFIG_SILENCEREMOVE_FILTER 0
+%define CONFIG_SINC_FILTER 0
 %define CONFIG_SINE_FILTER 0
 %define CONFIG_SINGLEJPEG_MUXER 0
 %define CONFIG_SIPR_DECODER 0
@@ -1411,6 +1490,7 @@
 %define CONFIG_SNOW_DECODER 0
 %define CONFIG_SNOW_ENCODER 0
 %define CONFIG_SOBEL_FILTER 0
+%define CONFIG_SOBEL_OPENCL_FILTER 0
 %define CONFIG_SOFALIZER_FILTER 0
 %define CONFIG_SOL_DEMUXER 0
 %define CONFIG_SOL_DPCM_DECODER 0
@@ -1427,6 +1507,7 @@
 %define CONFIG_SPLIT_FILTER 0
 %define CONFIG_SPP_FILTER 0
 %define CONFIG_SPX_MUXER 0
+%define CONFIG_SR_FILTER 0
 %define CONFIG_SRGC_DECODER 0
 %define CONFIG_SRT_DECODER 0
 %define CONFIG_SRT_DEMUXER 0
@@ -1502,14 +1583,21 @@
 %define CONFIG_TINTERLACE_FILTER 0
 %define CONFIG_TLS_PROTOCOL 0
 %define CONFIG_TLUT2_FILTER 0
+%define CONFIG_TMIX_FILTER 0
 %define CONFIG_TMV_DECODER 0
 %define CONFIG_TMV_DEMUXER 0
 %define CONFIG_TONEMAP_FILTER 0
+%define CONFIG_TONEMAP_OPENCL_FILTER 0
+%define CONFIG_TPAD_FILTER 0
 %define CONFIG_TRACE_HEADERS_BSF 0
 %define CONFIG_TRANSPOSE_FILTER 0
+%define CONFIG_TRANSPOSE_NPP_FILTER 0
+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0
+%define CONFIG_TRANSPOSE_VAAPI_FILTER 0
 %define CONFIG_TREBLE_FILTER 0
 %define CONFIG_TREMOLO_FILTER 0
 %define CONFIG_TRIM_FILTER 0
+%define CONFIG_TRUEHD_CORE_BSF 0
 %define CONFIG_TRUEHD_DECODER 0
 %define CONFIG_TRUEHD_DEMUXER 0
 %define CONFIG_TRUEHD_ENCODER 0
@@ -1555,6 +1643,7 @@
 %define CONFIG_V4L2_OUTDEV 0
 %define CONFIG_VAG_DEMUXER 0
 %define CONFIG_VAGUEDENOISER_FILTER 0
+%define CONFIG_VAPOURSYNTH_DEMUXER 0
 %define CONFIG_VB_DECODER 0
 %define CONFIG_VBLE_DECODER 0
 %define CONFIG_VC1_CRYSTALHD_DECODER 0
@@ -1581,10 +1670,12 @@
 %define CONFIG_VFLIP_FILTER 0
 %define CONFIG_VFRDET_FILTER 0
 %define CONFIG_VFWCAP_INDEV 0
+%define CONFIG_VIBRANCE_FILTER 0
 %define CONFIG_VIBRATO_FILTER 0
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 0
+%define CONFIG_VIVIDAS_DEMUXER 0
 %define CONFIG_VIVO_DEMUXER 0
 %define CONFIG_VMAFMOTION_FILTER 0
 %define CONFIG_VMDAUDIO_DECODER 0
@@ -1601,6 +1692,7 @@
 %define CONFIG_VORBIS_PARSER 0
 %define CONFIG_VP3_DECODER 0
 %define CONFIG_VP3_PARSER 0
+%define CONFIG_VP4_DECODER 0
 %define CONFIG_VP5_DECODER 0
 %define CONFIG_VP6A_DECODER 0
 %define CONFIG_VP6_DECODER 0
@@ -1620,6 +1712,7 @@
 %define CONFIG_VP9_D3D11VA_HWACCEL 0
 %define CONFIG_VP9_DXVA2_HWACCEL 0
 %define CONFIG_VP9_MEDIACODEC_DECODER 0
+%define CONFIG_VP9_METADATA_BSF 0
 %define CONFIG_VP9_NVDEC_HWACCEL 0
 %define CONFIG_VP9_RAW_REORDER_BSF 0
 %define CONFIG_VP9_RKMPP_DECODER 0
@@ -1643,6 +1736,7 @@
 %define CONFIG_WAVPACK_DECODER 0
 %define CONFIG_WAVPACK_ENCODER 0
 %define CONFIG_WC3_DEMUXER 0
+%define CONFIG_WCMV_DECODER 0
 %define CONFIG_WEAVE_FILTER 0
 %define CONFIG_WEBM_CHUNK_MUXER 0
 %define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
@@ -1702,8 +1796,10 @@
 %define CONFIG_XMA1_DECODER 0
 %define CONFIG_XMA2_DECODER 0
 %define CONFIG_XMA_PARSER 0
+%define CONFIG_XMEDIAN_FILTER 0
 %define CONFIG_XMV_DEMUXER 0
 %define CONFIG_XPM_DECODER 0
+%define CONFIG_XSTACK_FILTER 0
 %define CONFIG_XSUB_DECODER 0
 %define CONFIG_XSUB_ENCODER 0
 %define CONFIG_XVAG_DEMUXER 0
@@ -1713,6 +1809,7 @@
 %define CONFIG_XWMA_DEMUXER 0
 %define CONFIG_Y41P_DECODER 0
 %define CONFIG_Y41P_ENCODER 0
+%define CONFIG_YADIF_CUDA_FILTER 0
 %define CONFIG_YADIF_FILTER 0
 %define CONFIG_YLC_DECODER 0
 %define CONFIG_YOP_DECODER 0

media/ffvpx/defaults_disabled.h

@@ -28,14 +28,20 @@
 #define CONFIG_ACONTRAST_FILTER 0
 #define CONFIG_ACOPY_FILTER 0
 #define CONFIG_ACROSSFADE_FILTER 0
+#define CONFIG_ACROSSOVER_FILTER 0
 #define CONFIG_ACRUSHER_FILTER 0
 #define CONFIG_ACT_DEMUXER 0
+#define CONFIG_ACUE_FILTER 0
+#define CONFIG_ADECLICK_FILTER 0
+#define CONFIG_ADECLIP_FILTER 0
 #define CONFIG_ADELAY_FILTER 0
+#define CONFIG_ADERIVATIVE_FILTER 0
 #define CONFIG_ADF_DEMUXER 0
 #define CONFIG_ADPCM_4XM_DECODER 0
 #define CONFIG_ADPCM_ADX_DECODER 0
 #define CONFIG_ADPCM_ADX_ENCODER 0
 #define CONFIG_ADPCM_AFC_DECODER 0
+#define CONFIG_ADPCM_AGM_DECODER 0
 #define CONFIG_ADPCM_AICA_DECODER 0
 #define CONFIG_ADPCM_CT_DECODER 0
 #define CONFIG_ADPCM_DTK_DECODER 0
@@ -97,16 +103,20 @@
 #define CONFIG_AEVALSRC_FILTER 0
 #define CONFIG_AFADE_FILTER 0
 #define CONFIG_AFC_DEMUXER 0
+#define CONFIG_AFFTDN_FILTER 0
 #define CONFIG_AFFTFILT_FILTER 0
 #define CONFIG_AFIFO_FILTER 0
 #define CONFIG_AFIR_FILTER 0
 #define CONFIG_AFORMAT_FILTER 0
 #define CONFIG_AGATE_FILTER 0
+#define CONFIG_AGM_DECODER 0
+#define CONFIG_AGRAPHMONITOR_FILTER 0
 #define CONFIG_AHISTOGRAM_FILTER 0
 #define CONFIG_AIC_DECODER 0
 #define CONFIG_AIFF_DEMUXER 0
 #define CONFIG_AIFF_MUXER 0
 #define CONFIG_AIIR_FILTER 0
+#define CONFIG_AINTEGRAL_FILTER 0
 #define CONFIG_AINTERLEAVE_FILTER 0
 #define CONFIG_AIX_DEMUXER 0
 #define CONFIG_ALAC_AT_DECODER 0
@@ -129,6 +139,7 @@
 #define CONFIG_AMETADATA_FILTER 0
 #define CONFIG_AMIX_FILTER 0
 #define CONFIG_AMOVIE_FILTER 0
+#define CONFIG_AMPLIFY_FILTER 0
 #define CONFIG_AMR_DEMUXER 0
 #define CONFIG_AMR_MUXER 0
 #define CONFIG_AMR_NB_AT_DECODER 0
@@ -136,10 +147,12 @@
 #define CONFIG_AMRNB_DEMUXER 0
 #define CONFIG_AMRWB_DECODER 0
 #define CONFIG_AMRWB_DEMUXER 0
+#define CONFIG_AMULTIPLY_FILTER 0
 #define CONFIG_AMV_DECODER 0
 #define CONFIG_AMV_ENCODER 0
 #define CONFIG_ANDROID_CAMERA_INDEV 0
 #define CONFIG_ANEQUALIZER_FILTER 0
+#define CONFIG_ANLMDN_FILTER 0
 #define CONFIG_ANM_DECODER 0
 #define CONFIG_ANM_DEMUXER 0
 #define CONFIG_ANOISESRC_FILTER 0
@@ -168,6 +181,7 @@
 #define CONFIG_APTX_MUXER 0
 #define CONFIG_APULSATOR_FILTER 0
 #define CONFIG_AQTITLE_DEMUXER 0
+#define CONFIG_ARBC_DECODER 0
 #define CONFIG_AREALTIME_FILTER 0
 #define CONFIG_ARESAMPLE_FILTER 0
 #define CONFIG_AREVERSE_FILTER 0
@@ -183,7 +197,9 @@
 #define CONFIG_ASF_STREAM_MUXER 0
 #define CONFIG_ASHOWINFO_FILTER 0
 #define CONFIG_ASIDEDATA_FILTER 0
+#define CONFIG_ASOFTCLIP_FILTER 0
 #define CONFIG_ASPLIT_FILTER 0
+#define CONFIG_ASR_FILTER 0
 #define CONFIG_ASS_DECODER 0
 #define CONFIG_ASS_DEMUXER 0
 #define CONFIG_ASS_ENCODER 0
@@ -205,11 +221,15 @@
 #define CONFIG_ATRAC3_DECODER 0
 #define CONFIG_ATRAC3PAL_DECODER 0
 #define CONFIG_ATRAC3P_DECODER 0
+#define CONFIG_ATRAC9_DECODER 0
 #define CONFIG_ATRIM_FILTER 0
 #define CONFIG_AU_DEMUXER 0
 #define CONFIG_AU_MUXER 0
 #define CONFIG_AURA2_DECODER 0
 #define CONFIG_AURA_DECODER 0
+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
+#define CONFIG_AV1_METADATA_BSF 0
+#define CONFIG_AV1_PARSER 0
 #define CONFIG_AVECTORSCOPE_FILTER 0
 #define CONFIG_AVFOUNDATION_INDEV 0
 #define CONFIG_AVGBLUR_FILTER 0
@@ -222,6 +242,9 @@
 #define CONFIG_AVRN_DECODER 0
 #define CONFIG_AVRP_DECODER 0
 #define CONFIG_AVRP_ENCODER 0
+#define CONFIG_AVS2_DEMUXER 0
+#define CONFIG_AVS2_MUXER 0
+#define CONFIG_AVS2_PARSER 0
 #define CONFIG_AVS_DECODER 0
 #define CONFIG_AVS_DEMUXER 0
 #define CONFIG_AVUI_DECODER 0
@@ -255,6 +278,7 @@
 #define CONFIG_BLACKFRAME_FILTER 0
 #define CONFIG_BLEND_FILTER 0
 #define CONFIG_BLURAY_PROTOCOL 0
+#define CONFIG_BM3D_FILTER 0
 #define CONFIG_BMP_DECODER 0
 #define CONFIG_BMP_ENCODER 0
 #define CONFIG_BMP_PARSER 0
@@ -263,6 +287,7 @@
 #define CONFIG_BMV_VIDEO_DECODER 0
 #define CONFIG_BOA_DEMUXER 0
 #define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
 #define CONFIG_BRENDER_PIX_DECODER 0
 #define CONFIG_BRSTM_DEMUXER 0
 #define CONFIG_BS2B_FILTER 0
@@ -288,8 +313,10 @@
 #define CONFIG_CHANNELSPLIT_FILTER 0
 #define CONFIG_CHOMP_BSF 0
 #define CONFIG_CHORUS_FILTER 0
+#define CONFIG_CHROMAHOLD_FILTER 0
 #define CONFIG_CHROMAKEY_FILTER 0
 #define CONFIG_CHROMAPRINT_MUXER 0
+#define CONFIG_CHROMASHIFT_FILTER 0
 #define CONFIG_CIESCOPE_FILTER 0
 #define CONFIG_CINE_DEMUXER 0
 #define CONFIG_CINEPAK_DECODER 0
@@ -306,7 +333,9 @@
 #define CONFIG_COLORBALANCE_FILTER 0
 #define CONFIG_COLORCHANNELMIXER_FILTER 0
 #define CONFIG_COLOR_FILTER 0
+#define CONFIG_COLORHOLD_FILTER 0
 #define CONFIG_COLORKEY_FILTER 0
+#define CONFIG_COLORKEY_OPENCL_FILTER 0
 #define CONFIG_COLORLEVELS_FILTER 0
 #define CONFIG_COLORMATRIX_FILTER 0
 #define CONFIG_COLORSPACE_FILTER 0
@@ -334,6 +363,7 @@
 #define CONFIG_CRYPTO_PROTOCOL 0
 #define CONFIG_CRYSTALIZER_FILTER 0
 #define CONFIG_CSCD_DECODER 0
+#define CONFIG_CUE_FILTER 0
 #define CONFIG_CURVES_FILTER 0
 #define CONFIG_CYUV_DECODER 0
 #define CONFIG_DASH_DEMUXER 0
@@ -353,10 +383,13 @@
 #define CONFIG_DCTDNOIZ_FILTER 0
 #define CONFIG_DDS_DECODER 0
 #define CONFIG_DEBAND_FILTER 0
+#define CONFIG_DEBLOCK_FILTER 0
 #define CONFIG_DECIMATE_FILTER 0
 #define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_DECKLINK_OUTDEV 0
 #define CONFIG_DECONVOLVE_FILTER 0
+#define CONFIG_DEDOT_FILTER 0
+#define CONFIG_DEESSER_FILTER 0
 #define CONFIG_DEFLATE_FILTER 0
 #define CONFIG_DEFLICKER_FILTER 0
 #define CONFIG_DEINTERLACE_QSV_FILTER 0
@@ -365,12 +398,15 @@
 #define CONFIG_DELOGO_FILTER 0
 #define CONFIG_DEMUXERS 0
 #define CONFIG_DENOISE_VAAPI_FILTER 0
+#define CONFIG_DERAIN_FILTER 0
 #define CONFIG_DESHAKE_FILTER 0
 #define CONFIG_DESPILL_FILTER 0
 #define CONFIG_DETELECINE_FILTER 0
 #define CONFIG_DFA_DECODER 0
 #define CONFIG_DFA_DEMUXER 0
+#define CONFIG_DHAV_DEMUXER 0
 #define CONFIG_DILATION_FILTER 0
+#define CONFIG_DILATION_OPENCL_FILTER 0
 #define CONFIG_DIRAC_DECODER 0
 #define CONFIG_DIRAC_DEMUXER 0
 #define CONFIG_DIRAC_MUXER 0
@@ -453,6 +489,7 @@
 #define CONFIG_EQ_FILTER 0
 #define CONFIG_EQUALIZER_FILTER 0
 #define CONFIG_EROSION_FILTER 0
+#define CONFIG_EROSION_OPENCL_FILTER 0
 #define CONFIG_ESCAPE124_DECODER 0
 #define CONFIG_ESCAPE130_DECODER 0
 #define CONFIG_EVRC_DECODER 0
@@ -468,6 +505,7 @@
 #define CONFIG_FFMETADATA_MUXER 0
 #define CONFIG_FFRTMPCRYPT_PROTOCOL 0
 #define CONFIG_FFRTMPHTTP_PROTOCOL 0
+#define CONFIG_FFTDNOIZ_FILTER 0
 #define CONFIG_FFTFILT_FILTER 0
 #define CONFIG_FFV1_DECODER 0
 #define CONFIG_FFV1_ENCODER 0
@@ -524,6 +562,7 @@
 #define CONFIG_FRAMESTEP_FILTER 0
 #define CONFIG_FRAME_THREAD_ENCODER 0
 #define CONFIG_FRAPS_DECODER 0
+#define CONFIG_FREEZEDETECT_FILTER 0
 #define CONFIG_FREI0R_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
 #define CONFIG_FRM_DEMUXER 0
@@ -538,6 +577,7 @@
 #define CONFIG_G723_1_DEMUXER 0
 #define CONFIG_G723_1_ENCODER 0
 #define CONFIG_G723_1_MUXER 0
+#define CONFIG_G723_1_PARSER 0
 #define CONFIG_G726_DEMUXER 0
 #define CONFIG_G726LE_DEMUXER 0
 #define CONFIG_G726LE_MUXER 0
@@ -555,9 +595,12 @@
 #define CONFIG_GIF_DEMUXER 0
 #define CONFIG_GIF_ENCODER 0
 #define CONFIG_GIF_MUXER 0
+#define CONFIG_GIF_PARSER 0
 #define CONFIG_GOPHER_PROTOCOL 0
 #define CONFIG_GRADFUN_FILTER 0
+#define CONFIG_GRAPHMONITOR_FILTER 0
 #define CONFIG_GREMLIN_DPCM_DECODER 0
+#define CONFIG_GREYEDGE_FILTER 0
 #define CONFIG_GSM_DECODER 0
 #define CONFIG_GSM_DEMUXER 0
 #define CONFIG_GSM_MS_AT_DECODER 0
@@ -618,6 +661,8 @@
 #define CONFIG_HAP_ENCODER 0
 #define CONFIG_HAPQA_EXTRACT_BSF 0
 #define CONFIG_HASH_MUXER 0
+#define CONFIG_HCOM_DECODER 0
+#define CONFIG_HCOM_DEMUXER 0
 #define CONFIG_HDCD_FILTER 0
 #define CONFIG_HDS_MUXER 0
 #define CONFIG_HEADPHONE_FILTER 0
@@ -647,6 +692,7 @@
 #define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HFLIP_FILTER 0
 #define CONFIG_HIGHPASS_FILTER 0
+#define CONFIG_HIGHSHELF_FILTER 0
 #define CONFIG_HILBERT_FILTER 0
 #define CONFIG_HISTEQ_FILTER 0
 #define CONFIG_HISTOGRAM_FILTER 0
@@ -671,6 +717,7 @@
 #define CONFIG_HWMAP_FILTER 0
 #define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HWUPLOAD_FILTER 0
+#define CONFIG_HYMT_DECODER 0
 #define CONFIG_HYSTERESIS_FILTER 0
 #define CONFIG_IAC_DECODER 0
 #define CONFIG_ICECAST_PROTOCOL 0
@@ -684,8 +731,10 @@
 #define CONFIG_IEC61883_INDEV 0
 #define CONFIG_IFF_DEMUXER 0
 #define CONFIG_IFF_ILBM_DECODER 0
+#define CONFIG_IFV_DEMUXER 0
 #define CONFIG_ILBC_AT_DECODER 0
 #define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_ILBC_DECODER 0
 #define CONFIG_ILBC_DEMUXER 0
 #define CONFIG_ILBC_MUXER 0
 #define CONFIG_IL_FILTER 0
@@ -699,6 +748,7 @@
 #define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
@@ -718,7 +768,9 @@
 #define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
 #define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
 #define CONFIG_IMC_DECODER 0
+#define CONFIG_IMM4_DECODER 0
 #define CONFIG_IMX_DUMP_HEADER_BSF 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
@@ -757,17 +809,23 @@
 #define CONFIG_KGV1_DECODER 0
 #define CONFIG_KMSGRAB_INDEV 0
 #define CONFIG_KMVC_DECODER 0
+#define CONFIG_KUX_DEMUXER 0
 #define CONFIG_LADSPA_FILTER 0
 #define CONFIG_LAGARITH_DECODER 0
+#define CONFIG_LAGFUN_FILTER 0
 #define CONFIG_LATM_MUXER 0
 #define CONFIG_LAVFI_INDEV 0
 #define CONFIG_LENSCORRECTION_FILTER 0
+#define CONFIG_LENSFUN_FILTER 0
 #define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_LIBAOM_AV1_ENCODER 0
+#define CONFIG_LIBARIBB24_DECODER 0
 #define CONFIG_LIBCDIO_INDEV 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
 #define CONFIG_LIBCODEC2_ENCODER 0
+#define CONFIG_LIBDAV1D_DECODER 0
+#define CONFIG_LIBDAVS2_DECODER 0
 #define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
@@ -781,8 +839,6 @@
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBMP3LAME_ENCODER 0
-#define CONFIG_LIBNDI_NEWTEK_INDEV 0
-#define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
 #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
 #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
@@ -822,6 +878,7 @@
 #define CONFIG_LIBX264_ENCODER 0
 #define CONFIG_LIBX264RGB_ENCODER 0
 #define CONFIG_LIBX265_ENCODER 0
+#define CONFIG_LIBXAVS2_ENCODER 0
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 0
 #define CONFIG_LIBZVBI_TELETEXT_DECODER 0
@@ -835,9 +892,12 @@
 #define CONFIG_LOOP_FILTER 0
 #define CONFIG_LOUDNORM_FILTER 0
 #define CONFIG_LOWPASS_FILTER 0
+#define CONFIG_LOWSHELF_FILTER 0
 #define CONFIG_LRC_DEMUXER 0
 #define CONFIG_LRC_MUXER 0
+#define CONFIG_LSCR_DECODER 0
 #define CONFIG_LUMAKEY_FILTER 0
+#define CONFIG_LUT1D_FILTER 0
 #define CONFIG_LUT2_FILTER 0
 #define CONFIG_LUT3D_FILTER 0
 #define CONFIG_LUT_FILTER 0
@@ -856,6 +916,7 @@
 #define CONFIG_MANDELBROT_FILTER 0
 #define CONFIG_MASKEDCLAMP_FILTER 0
 #define CONFIG_MASKEDMERGE_FILTER 0
+#define CONFIG_MASKFUN_FILTER 0
 #define CONFIG_MATROSKA_AUDIO_MUXER 0
 #define CONFIG_MATROSKA_DEMUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@@ -1021,6 +1082,7 @@
 #define CONFIG_MVC2_DECODER 0
 #define CONFIG_MV_DEMUXER 0
 #define CONFIG_MVI_DEMUXER 0
+#define CONFIG_MWSC_DECODER 0
 #define CONFIG_MXF_D10_MUXER 0
 #define CONFIG_MXF_DEMUXER 0
 #define CONFIG_MXF_MUXER 0
@@ -1033,6 +1095,7 @@
 #define CONFIG_NELLYMOSER_ENCODER 0
 #define CONFIG_NISTSPHERE_DEMUXER 0
 #define CONFIG_NLMEANS_FILTER 0
+#define CONFIG_NLMEANS_OPENCL_FILTER 0
 #define CONFIG_NNEDI_FILTER 0
 #define CONFIG_NOFORMAT_FILTER 0
 #define CONFIG_NOISE_BSF 0
@@ -1079,6 +1142,8 @@
 #define CONFIG_PAF_AUDIO_DECODER 0
 #define CONFIG_PAF_DEMUXER 0
 #define CONFIG_PAF_VIDEO_DECODER 0
+#define CONFIG_PAL100BARS_FILTER 0
+#define CONFIG_PAL75BARS_FILTER 0
 #define CONFIG_PALETTEGEN_FILTER 0
 #define CONFIG_PALETTEUSE_FILTER 0
 #define CONFIG_PAM_DECODER 0
@@ -1094,6 +1159,7 @@
 #define CONFIG_PCM_ALAW_MUXER 0
 #define CONFIG_PCM_BLURAY_DECODER 0
 #define CONFIG_PCM_DVD_DECODER 0
+#define CONFIG_PCM_DVD_ENCODER 0
 #define CONFIG_PCM_F16LE_DECODER 0
 #define CONFIG_PCM_F24LE_DECODER 0
 #define CONFIG_PCM_F32BE_DECODER 0
@@ -1191,6 +1257,10 @@
 #define CONFIG_PCM_U8_DEMUXER 0
 #define CONFIG_PCM_U8_ENCODER 0
 #define CONFIG_PCM_U8_MUXER 0
+#define CONFIG_PCM_VIDC_DECODER 0
+#define CONFIG_PCM_VIDC_DEMUXER 0
+#define CONFIG_PCM_VIDC_ENCODER 0
+#define CONFIG_PCM_VIDC_MUXER 0
 #define CONFIG_PCM_ZORK_DECODER 0
 #define CONFIG_PCX_DECODER 0
 #define CONFIG_PCX_ENCODER 0
@@ -1220,6 +1290,7 @@
 #define CONFIG_PPM_ENCODER 0
 #define CONFIG_PREMULTIPLY_FILTER 0
 #define CONFIG_PREWITT_FILTER 0
+#define CONFIG_PREWITT_OPENCL_FILTER 0
 #define CONFIG_PROCAMP_VAAPI_FILTER 0
 #define CONFIG_PROGRAM_OPENCL_FILTER 0
 #define CONFIG_PROMPEG_PROTOCOL 0
@@ -1227,7 +1298,8 @@
 #define CONFIG_PRORES_DECODER 0
 #define CONFIG_PRORES_ENCODER 0
 #define CONFIG_PRORES_KS_ENCODER 0
-#define CONFIG_PRORES_LGPL_DECODER 0
+#define CONFIG_PRORES_METADATA_BSF 0
+#define CONFIG_PROSUMER_DECODER 0
 #define CONFIG_PROTOCOLS 0
 #define CONFIG_PSD_DECODER 0
 #define CONFIG_PSEUDOCOLOR_FILTER 0
@@ -1260,6 +1332,7 @@
 #define CONFIG_RA_288_DECODER 0
 #define CONFIG_RALF_DECODER 0
 #define CONFIG_RANDOM_FILTER 0
+#define CONFIG_RASC_DECODER 0
 #define CONFIG_RAWVIDEO_DECODER 0
 #define CONFIG_RAWVIDEO_DEMUXER 0
 #define CONFIG_RAWVIDEO_ENCODER 0
@@ -1278,12 +1351,14 @@
 #define CONFIG_REPLAYGAIN_FILTER 0
 #define CONFIG_RESAMPLE_FILTER 0
 #define CONFIG_REVERSE_FILTER 0
+#define CONFIG_RGBASHIFT_FILTER 0
 #define CONFIG_RGBTESTSRC_FILTER 0
 #define CONFIG_RL2_DECODER 0
 #define CONFIG_RL2_DEMUXER 0
 #define CONFIG_RM_DEMUXER 0
 #define CONFIG_RM_MUXER 0
 #define CONFIG_ROBERTS_FILTER 0
+#define CONFIG_ROBERTS_OPENCL_FILTER 0
 #define CONFIG_ROQ_DECODER 0
 #define CONFIG_ROQ_DEMUXER 0
 #define CONFIG_ROQ_DPCM_DECODER 0
@@ -1357,8 +1432,10 @@
 #define CONFIG_SELECTIVECOLOR_FILTER 0
 #define CONFIG_SENDCMD_FILTER 0
 #define CONFIG_SEPARATEFIELDS_FILTER 0
+#define CONFIG_SER_DEMUXER 0
 #define CONFIG_SETDAR_FILTER 0
 #define CONFIG_SETFIELD_FILTER 0
+#define CONFIG_SETPARAMS_FILTER 0
 #define CONFIG_SETPTS_FILTER 0
 #define CONFIG_SETRANGE_FILTER 0
 #define CONFIG_SETSAR_FILTER 0
@@ -1374,6 +1451,7 @@
 #define CONFIG_SHOWFREQS_FILTER 0
 #define CONFIG_SHOWINFO_FILTER 0
 #define CONFIG_SHOWPALETTE_FILTER 0
+#define CONFIG_SHOWSPATIAL_FILTER 0
 #define CONFIG_SHOWSPECTRUM_FILTER 0
 #define CONFIG_SHOWSPECTRUMPIC_FILTER 0
 #define CONFIG_SHOWVOLUME_FILTER 0
@@ -1389,6 +1467,7 @@
 #define CONFIG_SIGNATURE_FILTER 0
 #define CONFIG_SILENCEDETECT_FILTER 0
 #define CONFIG_SILENCEREMOVE_FILTER 0
+#define CONFIG_SINC_FILTER 0
 #define CONFIG_SINE_FILTER 0
 #define CONFIG_SINGLEJPEG_MUXER 0
 #define CONFIG_SIPR_DECODER 0
@@ -1411,6 +1490,7 @@
 #define CONFIG_SNOW_DECODER 0
 #define CONFIG_SNOW_ENCODER 0
 #define CONFIG_SOBEL_FILTER 0
+#define CONFIG_SOBEL_OPENCL_FILTER 0
 #define CONFIG_SOFALIZER_FILTER 0
 #define CONFIG_SOL_DEMUXER 0
 #define CONFIG_SOL_DPCM_DECODER 0
@@ -1427,6 +1507,7 @@
 #define CONFIG_SPLIT_FILTER 0
 #define CONFIG_SPP_FILTER 0
 #define CONFIG_SPX_MUXER 0
+#define CONFIG_SR_FILTER 0
 #define CONFIG_SRGC_DECODER 0
 #define CONFIG_SRT_DECODER 0
 #define CONFIG_SRT_DEMUXER 0
@@ -1502,14 +1583,21 @@
 #define CONFIG_TINTERLACE_FILTER 0
 #define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_TLUT2_FILTER 0
+#define CONFIG_TMIX_FILTER 0
 #define CONFIG_TMV_DECODER 0
 #define CONFIG_TMV_DEMUXER 0
 #define CONFIG_TONEMAP_FILTER 0
+#define CONFIG_TONEMAP_OPENCL_FILTER 0
+#define CONFIG_TPAD_FILTER 0
 #define CONFIG_TRACE_HEADERS_BSF 0
 #define CONFIG_TRANSPOSE_FILTER 0
+#define CONFIG_TRANSPOSE_NPP_FILTER 0
+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
 #define CONFIG_TREBLE_FILTER 0
 #define CONFIG_TREMOLO_FILTER 0
 #define CONFIG_TRIM_FILTER 0
+#define CONFIG_TRUEHD_CORE_BSF 0
 #define CONFIG_TRUEHD_DECODER 0
 #define CONFIG_TRUEHD_DEMUXER 0
 #define CONFIG_TRUEHD_ENCODER 0
@@ -1555,6 +1643,7 @@
 #define CONFIG_V4L2_OUTDEV 0
 #define CONFIG_VAG_DEMUXER 0
 #define CONFIG_VAGUEDENOISER_FILTER 0
+#define CONFIG_VAPOURSYNTH_DEMUXER 0
 #define CONFIG_VB_DECODER 0
 #define CONFIG_VBLE_DECODER 0
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
@@ -1581,10 +1670,12 @@
 #define CONFIG_VFLIP_FILTER 0
 #define CONFIG_VFRDET_FILTER 0
 #define CONFIG_VFWCAP_INDEV 0
+#define CONFIG_VIBRANCE_FILTER 0
 #define CONFIG_VIBRATO_FILTER 0
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 0
+#define CONFIG_VIVIDAS_DEMUXER 0
 #define CONFIG_VIVO_DEMUXER 0
 #define CONFIG_VMAFMOTION_FILTER 0
 #define CONFIG_VMDAUDIO_DECODER 0
@@ -1601,6 +1692,7 @@
 #define CONFIG_VORBIS_PARSER 0
 #define CONFIG_VP3_DECODER 0
 #define CONFIG_VP3_PARSER 0
+#define CONFIG_VP4_DECODER 0
 #define CONFIG_VP5_DECODER 0
 #define CONFIG_VP6A_DECODER 0
 #define CONFIG_VP6_DECODER 0
@@ -1620,6 +1712,7 @@
 #define CONFIG_VP9_D3D11VA_HWACCEL 0
 #define CONFIG_VP9_DXVA2_HWACCEL 0
 #define CONFIG_VP9_MEDIACODEC_DECODER 0
+#define CONFIG_VP9_METADATA_BSF 0
 #define CONFIG_VP9_NVDEC_HWACCEL 0
 #define CONFIG_VP9_RAW_REORDER_BSF 0
 #define CONFIG_VP9_RKMPP_DECODER 0
@@ -1643,6 +1736,7 @@
 #define CONFIG_WAVPACK_DECODER 0
 #define CONFIG_WAVPACK_ENCODER 0
 #define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WCMV_DECODER 0
 #define CONFIG_WEAVE_FILTER 0
 #define CONFIG_WEBM_CHUNK_MUXER 0
 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
@@ -1702,8 +1796,10 @@
 #define CONFIG_XMA1_DECODER 0
 #define CONFIG_XMA2_DECODER 0
 #define CONFIG_XMA_PARSER 0
+#define CONFIG_XMEDIAN_FILTER 0
 #define CONFIG_XMV_DEMUXER 0
 #define CONFIG_XPM_DECODER 0
+#define CONFIG_XSTACK_FILTER 0
 #define CONFIG_XSUB_DECODER 0
 #define CONFIG_XSUB_ENCODER 0
 #define CONFIG_XVAG_DEMUXER 0
@@ -1713,6 +1809,7 @@
 #define CONFIG_XWMA_DEMUXER 0
 #define CONFIG_Y41P_DECODER 0
 #define CONFIG_Y41P_ENCODER 0
+#define CONFIG_YADIF_CUDA_FILTER 0
 #define CONFIG_YADIF_FILTER 0
 #define CONFIG_YLC_DECODER 0
 #define CONFIG_YOP_DECODER 0

media/ffvpx/libavcodec/aarch64/moz.build

@@ -22,9 +22,10 @@ SOURCES += [
     'simple_idct_neon.S',
     'videodsp.S',
     'videodsp_init.c',
+    'vp8dsp_init_aarch64.c',
+    'vp8dsp_neon.S',
     'vp9dsp_init_10bpp_aarch64.c',
     'vp9dsp_init_12bpp_aarch64.c',
-    'vp9dsp_init_16bpp_aarch64_template.c',
     'vp9dsp_init_aarch64.c',
     'vp9itxfm_16bpp_neon.S',
     'vp9itxfm_neon.S',

media/ffvpx/libavcodec/aarch64/vp8dsp.h

@@ -0,0 +1,75 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AARCH64_VP8DSP_H
+#define AVCODEC_AARCH64_VP8DSP_H
+
+#include "libavcodec/vp8dsp.h"
+
+#define VP8_LF_Y(hv, inner, opt)                                             \
+    void ff_vp8_##hv##_loop_filter16##inner##_##opt(uint8_t *dst,            \
+                                                    ptrdiff_t stride,        \
+                                                    int flim_E, int flim_I,  \
+                                                    int hev_thresh)
+
+#define VP8_LF_UV(hv, inner, opt)                                            \
+    void ff_vp8_##hv##_loop_filter8uv##inner##_##opt(uint8_t *dstU,          \
+                                                     uint8_t *dstV,          \
+                                                     ptrdiff_t stride,       \
+                                                     int flim_E, int flim_I, \
+                                                     int hev_thresh)
+
+#define VP8_LF_SIMPLE(hv, opt)                                          \
+    void ff_vp8_##hv##_loop_filter16_simple_##opt(uint8_t *dst,         \
+                                                  ptrdiff_t stride,     \
+                                                  int flim)
+
+#define VP8_LF_HV(inner, opt)                   \
+    VP8_LF_Y(h,  inner, opt);                   \
+    VP8_LF_Y(v,  inner, opt);                   \
+    VP8_LF_UV(h, inner, opt);                   \
+    VP8_LF_UV(v, inner, opt)
+
+#define VP8_LF(opt)                             \
+    VP8_LF_HV(,       opt);                     \
+    VP8_LF_HV(_inner, opt);                     \
+    VP8_LF_SIMPLE(h, opt);                      \
+    VP8_LF_SIMPLE(v, opt)
+
+#define VP8_MC(n, opt)                                                  \
+    void ff_put_vp8_##n##_##opt(uint8_t *dst, ptrdiff_t dststride,      \
+                                uint8_t *src, ptrdiff_t srcstride,      \
+                                int h, int x, int y)
+
+#define VP8_EPEL(w, opt)                        \
+    VP8_MC(pixels ## w, opt);                   \
+    VP8_MC(epel ## w ## _h4, opt);              \
+    VP8_MC(epel ## w ## _h6, opt);              \
+    VP8_MC(epel ## w ## _v4, opt);              \
+    VP8_MC(epel ## w ## _h4v4, opt);            \
+    VP8_MC(epel ## w ## _h6v4, opt);            \
+    VP8_MC(epel ## w ## _v6, opt);              \
+    VP8_MC(epel ## w ## _h4v6, opt);            \
+    VP8_MC(epel ## w ## _h6v6, opt)
+
+#define VP8_BILIN(w, opt)                       \
+    VP8_MC(bilin ## w ## _h, opt);              \
+    VP8_MC(bilin ## w ## _v, opt);              \
+    VP8_MC(bilin ## w ## _hv, opt)
+
+#endif /* AVCODEC_AARCH64_VP8DSP_H */

media/ffvpx/libavcodec/aarch64/vp8dsp_init_aarch64.c

@@ -0,0 +1,124 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/attributes.h"
+#include "libavutil/aarch64/cpu.h"
+#include "libavcodec/vp8dsp.h"
+#include "vp8dsp.h"
+
+void ff_vp8_luma_dc_wht_neon(int16_t block[4][4][16], int16_t dc[16]);
+
+void ff_vp8_idct_add_neon(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add_neon(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add4y_neon(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
+void ff_vp8_idct_dc_add4uv_neon(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
+
+VP8_LF(neon);
+
+VP8_EPEL(16, neon);
+VP8_EPEL(8,  neon);
+VP8_EPEL(4,  neon);
+
+VP8_BILIN(16, neon);
+VP8_BILIN(8,  neon);
+VP8_BILIN(4,  neon);
+
+av_cold void ff_vp78dsp_init_aarch64(VP8DSPContext *dsp)
+{
+    if (!have_neon(av_get_cpu_flags()))
+        return;
+    dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
+    dsp->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_neon;
+    dsp->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_neon;
+    dsp->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_neon;
+
+    dsp->put_vp8_epel_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
+    dsp->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_neon;
+    dsp->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_neon;
+    dsp->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_neon;
+    dsp->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_neon;
+    dsp->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_neon;
+    dsp->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_neon;
+    dsp->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_neon;
+    dsp->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_neon;
+
+    dsp->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_neon;
+    dsp->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_neon;
+    dsp->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_neon;
+    dsp->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_neon;
+    dsp->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_neon;
+    dsp->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_neon;
+    dsp->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_neon;
+    dsp->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_neon;
+
+    dsp->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][1][0] = ff_put_vp8_bilin16_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][1][1] = ff_put_vp8_bilin16_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][1][2] = ff_put_vp8_bilin16_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][2][1] = ff_put_vp8_bilin16_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_neon;
+
+    dsp->put_vp8_bilinear_pixels_tab[1][0][0] = ff_put_vp8_pixels8_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_neon;
+
+    dsp->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_neon;
+    dsp->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_neon;
+}
+
+av_cold void ff_vp8dsp_init_aarch64(VP8DSPContext *dsp)
+{
+    if (!have_neon(av_get_cpu_flags()))
+        return;
+    dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_neon;
+
+    dsp->vp8_idct_add       = ff_vp8_idct_add_neon;
+    dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_neon;
+    dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_neon;
+    dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_neon;
+
+    dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon;
+    dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon;
+    dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon;
+    dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon;
+
+    dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_neon;
+    dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_neon;
+    dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_neon;
+    dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_neon;
+
+    dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_neon;
+    dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_neon;
+}

media/ffvpx/libavcodec/allcodecs.c

@@ -35,12 +35,14 @@ extern AVCodec ff_aasc_decoder;
 extern AVCodec ff_aic_decoder;
 extern AVCodec ff_alias_pix_encoder;
 extern AVCodec ff_alias_pix_decoder;
+extern AVCodec ff_agm_decoder;
 extern AVCodec ff_amv_encoder;
 extern AVCodec ff_amv_decoder;
 extern AVCodec ff_anm_decoder;
 extern AVCodec ff_ansi_decoder;
 extern AVCodec ff_apng_encoder;
 extern AVCodec ff_apng_decoder;
+extern AVCodec ff_arbc_decoder;
 extern AVCodec ff_asv1_encoder;
 extern AVCodec ff_asv1_decoder;
 extern AVCodec ff_asv2_encoder;
@@ -58,6 +60,7 @@ extern AVCodec ff_ayuv_decoder;
 extern AVCodec ff_bethsoftvid_decoder;
 extern AVCodec ff_bfi_decoder;
 extern AVCodec ff_bink_decoder;
+extern AVCodec ff_bitpacked_decoder;
 extern AVCodec ff_bmp_encoder;
 extern AVCodec ff_bmp_decoder;
 extern AVCodec ff_bmv_video_decoder;
@@ -151,8 +154,10 @@ extern AVCodec ff_hq_hqa_decoder;
 extern AVCodec ff_hqx_decoder;
 extern AVCodec ff_huffyuv_encoder;
 extern AVCodec ff_huffyuv_decoder;
+extern AVCodec ff_hymt_decoder;
 extern AVCodec ff_idcin_decoder;
 extern AVCodec ff_iff_ilbm_decoder;
+extern AVCodec ff_imm4_decoder;
 extern AVCodec ff_indeo2_decoder;
 extern AVCodec ff_indeo3_decoder;
 extern AVCodec ff_indeo4_decoder;
@@ -168,6 +173,7 @@ extern AVCodec ff_kmvc_decoder;
 extern AVCodec ff_lagarith_decoder;
 extern AVCodec ff_ljpeg_encoder;
 extern AVCodec ff_loco_decoder;
+extern AVCodec ff_lscr_decoder;
 extern AVCodec ff_m101_decoder;
 extern AVCodec ff_magicyuv_encoder;
 extern AVCodec ff_magicyuv_decoder;
@@ -211,6 +217,7 @@ extern AVCodec ff_mszh_decoder;
 extern AVCodec ff_mts2_decoder;
 extern AVCodec ff_mvc1_decoder;
 extern AVCodec ff_mvc2_decoder;
+extern AVCodec ff_mwsc_decoder;
 extern AVCodec ff_mxpeg_decoder;
 extern AVCodec ff_nuv_decoder;
 extern AVCodec ff_paf_video_decoder;
@@ -234,7 +241,7 @@ extern AVCodec ff_prores_encoder;
 extern AVCodec ff_prores_decoder;
 extern AVCodec ff_prores_aw_encoder;
 extern AVCodec ff_prores_ks_encoder;
-extern AVCodec ff_prores_lgpl_decoder;
+extern AVCodec ff_prosumer_decoder;
 extern AVCodec ff_psd_decoder;
 extern AVCodec ff_ptx_decoder;
 extern AVCodec ff_qdraw_decoder;
@@ -245,6 +252,7 @@ extern AVCodec ff_r10k_encoder;
 extern AVCodec ff_r10k_decoder;
 extern AVCodec ff_r210_encoder;
 extern AVCodec ff_r210_decoder;
+extern AVCodec ff_rasc_decoder;
 extern AVCodec ff_rawvideo_encoder;
 extern AVCodec ff_rawvideo_decoder;
 extern AVCodec ff_rl2_decoder;
@@ -322,6 +330,7 @@ extern AVCodec ff_vcr1_decoder;
 extern AVCodec ff_vmdvideo_decoder;
 extern AVCodec ff_vmnc_decoder;
 extern AVCodec ff_vp3_decoder;
+extern AVCodec ff_vp4_decoder;
 extern AVCodec ff_vp5_decoder;
 extern AVCodec ff_vp6_decoder;
 extern AVCodec ff_vp6a_decoder;
@@ -334,8 +343,8 @@ extern AVCodec ff_vp9_decoder;
 extern AVCodec ff_vp9_rkmpp_decoder;
 extern AVCodec ff_vp9_v4l2m2m_decoder;
 extern AVCodec ff_vqa_decoder;
-extern AVCodec ff_bitpacked_decoder;
 extern AVCodec ff_webp_decoder;
+extern AVCodec ff_wcmv_decoder;
 extern AVCodec ff_wrapped_avframe_encoder;
 extern AVCodec ff_wrapped_avframe_decoder;
 extern AVCodec ff_wmv1_encoder;
@@ -393,6 +402,7 @@ extern AVCodec ff_atrac3_decoder;
 extern AVCodec ff_atrac3al_decoder;
 extern AVCodec ff_atrac3p_decoder;
 extern AVCodec ff_atrac3pal_decoder;
+extern AVCodec ff_atrac9_decoder;
 extern AVCodec ff_binkaudio_dct_decoder;
 extern AVCodec ff_binkaudio_rdft_decoder;
 extern AVCodec ff_bmv_audio_decoder;
@@ -418,7 +428,9 @@ extern AVCodec ff_g723_1_decoder;
 extern AVCodec ff_g729_decoder;
 extern AVCodec ff_gsm_decoder;
 extern AVCodec ff_gsm_ms_decoder;
+extern AVCodec ff_hcom_decoder;
 extern AVCodec ff_iac_decoder;
+extern AVCodec ff_ilbc_decoder;
 extern AVCodec ff_imc_decoder;
 extern AVCodec ff_interplay_acm_decoder;
 extern AVCodec ff_mace3_decoder;
@@ -488,6 +500,7 @@ extern AVCodec ff_xma2_decoder;
 extern AVCodec ff_pcm_alaw_encoder;
 extern AVCodec ff_pcm_alaw_decoder;
 extern AVCodec ff_pcm_bluray_decoder;
+extern AVCodec ff_pcm_dvd_encoder;
 extern AVCodec ff_pcm_dvd_decoder;
 extern AVCodec ff_pcm_f16le_decoder;
 extern AVCodec ff_pcm_f24le_decoder;
@@ -546,6 +559,8 @@ extern AVCodec ff_pcm_u32be_encoder;
 extern AVCodec ff_pcm_u32be_decoder;
 extern AVCodec ff_pcm_u32le_encoder;
 extern AVCodec ff_pcm_u32le_decoder;
+extern AVCodec ff_pcm_vidc_encoder;
+extern AVCodec ff_pcm_vidc_decoder;
 extern AVCodec ff_pcm_zork_decoder;
 
 /* DPCM codecs */
@@ -561,6 +576,7 @@ extern AVCodec ff_adpcm_4xm_decoder;
 extern AVCodec ff_adpcm_adx_encoder;
 extern AVCodec ff_adpcm_adx_decoder;
 extern AVCodec ff_adpcm_afc_decoder;
+extern AVCodec ff_adpcm_agm_decoder;
 extern AVCodec ff_adpcm_aica_decoder;
 extern AVCodec ff_adpcm_ct_decoder;
 extern AVCodec ff_adpcm_dtk_decoder;
@@ -665,9 +681,12 @@ extern AVCodec ff_qdmc_at_decoder;
 extern AVCodec ff_qdm2_at_decoder;
 extern AVCodec ff_libaom_av1_decoder;
 extern AVCodec ff_libaom_av1_encoder;
+extern AVCodec ff_libaribb24_decoder;
 extern AVCodec ff_libcelt_decoder;
 extern AVCodec ff_libcodec2_encoder;
 extern AVCodec ff_libcodec2_decoder;
+extern AVCodec ff_libdav1d_decoder;
+extern AVCodec ff_libdavs2_decoder;
 extern AVCodec ff_libfdk_aac_encoder;
 extern AVCodec ff_libfdk_aac_decoder;
 extern AVCodec ff_libgsm_encoder;
@@ -706,6 +725,7 @@ extern AVCodec ff_libx264_encoder;
 extern AVCodec ff_libx264rgb_encoder;
 extern AVCodec ff_libx265_encoder;
 extern AVCodec ff_libxavs_encoder;
+extern AVCodec ff_libxavs2_encoder;
 extern AVCodec ff_libxvid_encoder;
 extern AVCodec ff_libzvbi_teletext_decoder;
 
@@ -761,7 +781,15 @@ extern AVCodec ff_vp9_cuvid_decoder;
 extern AVCodec ff_vp9_mediacodec_decoder;
 extern AVCodec ff_vp9_vaapi_encoder;
 
+// The iterate API is not usable with ossfuzz due to the excessive size of binaries created
+#if CONFIG_OSSFUZZ
+AVCodec * codec_list[] = {
+    NULL,
+    NULL
+};
+#else
 #include "libavcodec/codec_list.c"
+#endif
 
 static AVOnce av_codec_static_init = AV_ONCE_INIT;
 static void av_codec_init_static(void)

media/ffvpx/libavcodec/avcodec.h

@@ -409,6 +409,7 @@ enum AVCodecID {
     AV_CODEC_ID_DXV,
     AV_CODEC_ID_SCREENPRESSO,
     AV_CODEC_ID_RSCC,
+    AV_CODEC_ID_AVS2,
 
     AV_CODEC_ID_Y41P = 0x8000,
     AV_CODEC_ID_AVRP,
@@ -446,6 +447,16 @@ enum AVCodecID {
     AV_CODEC_ID_SVG,
     AV_CODEC_ID_GDV,
     AV_CODEC_ID_FITS,
+    AV_CODEC_ID_IMM4,
+    AV_CODEC_ID_PROSUMER,
+    AV_CODEC_ID_MWSC,
+    AV_CODEC_ID_WCMV,
+    AV_CODEC_ID_RASC,
+    AV_CODEC_ID_HYMT,
+    AV_CODEC_ID_ARBC,
+    AV_CODEC_ID_AGM,
+    AV_CODEC_ID_LSCR,
+    AV_CODEC_ID_VP4,
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -485,6 +496,7 @@ enum AVCodecID {
     AV_CODEC_ID_PCM_S64BE,
     AV_CODEC_ID_PCM_F16LE,
     AV_CODEC_ID_PCM_F24LE,
+    AV_CODEC_ID_PCM_VIDC,
 
     /* various ADPCM codecs */
     AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -529,6 +541,7 @@ enum AVCodecID {
     AV_CODEC_ID_ADPCM_AICA,
     AV_CODEC_ID_ADPCM_IMA_DAT4,
     AV_CODEC_ID_ADPCM_MTAF,
+    AV_CODEC_ID_ADPCM_AGM,
 
     /* AMR */
     AV_CODEC_ID_AMR_NB = 0x12000,
@@ -637,6 +650,8 @@ enum AVCodecID {
     AV_CODEC_ID_APTX,
     AV_CODEC_ID_APTX_HD,
     AV_CODEC_ID_SBC,
+    AV_CODEC_ID_ATRAC9,
+    AV_CODEC_ID_HCOM,
 
     /* subtitle codecs */
     AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
@@ -665,6 +680,8 @@ enum AVCodecID {
     AV_CODEC_ID_PJS,
     AV_CODEC_ID_ASS,
     AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
+    AV_CODEC_ID_TTML,
+    AV_CODEC_ID_ARIB_CAPTION,
 
     /* other specific kind of codecs (generally used for attachments) */
     AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
@@ -843,6 +860,11 @@ typedef struct RcOverride{
  * Use qpel MC.
  */
 #define AV_CODEC_FLAG_QPEL            (1 <<  4)
+/**
+ * Don't output frames whose parameters differ from first
+ * decoded frame in stream.
+ */
+#define AV_CODEC_FLAG_DROPCHANGED     (1 <<  5)
 /**
  * Use internal 2pass ratecontrol in first pass mode.
  */
@@ -1062,6 +1084,13 @@ typedef struct RcOverride{
  */
 #define AV_CODEC_CAP_HYBRID              (1 << 19)
 
+/**
+ * This codec takes the reordered_opaque field from input AVFrames
+ * and returns it in the corresponding field in AVCodecContext after
+ * encoding.
+ */
+#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
+
 /**
  * Pan Scan area.
  * This specifies the area which should be displayed.
@@ -1101,17 +1130,29 @@ typedef struct AVCPBProperties {
      * Maximum bitrate of the stream, in bits per second.
      * Zero if unknown or unspecified.
      */
+#if FF_API_UNSANITIZED_BITRATES
     int max_bitrate;
+#else
+    int64_t max_bitrate;
+#endif
     /**
      * Minimum bitrate of the stream, in bits per second.
      * Zero if unknown or unspecified.
      */
+#if FF_API_UNSANITIZED_BITRATES
     int min_bitrate;
+#else
+    int64_t min_bitrate;
+#endif
     /**
      * Average bitrate of the stream, in bits per second.
      * Zero if unknown or unspecified.
      */
+#if FF_API_UNSANITIZED_BITRATES
     int avg_bitrate;
+#else
+    int64_t avg_bitrate;
+#endif
 
     /**
      * The size of the buffer to which the ratecontrol is applied, in bits.
@@ -1312,7 +1353,7 @@ enum AVPacketSideDataType {
     AV_PKT_DATA_METADATA_UPDATE,
 
     /**
-     * MPEGTS stream ID, this is required to pass the stream ID
+     * MPEGTS stream ID as uint8_t, this is required to pass the stream ID
      * information from the demuxer to the corresponding muxer.
      */
     AV_PKT_DATA_MPEGTS_STREAM_ID,
@@ -1357,6 +1398,12 @@ enum AVPacketSideDataType {
      */
     AV_PKT_DATA_ENCRYPTION_INFO,
 
+    /**
+     * Active Format Description data consisting of a single byte as specified
+     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+     */
+    AV_PKT_DATA_AFD,
+
     /**
      * The number of side data types.
      * This is not part of the public API/ABI in the sense that it may
@@ -1612,6 +1659,7 @@ typedef struct AVCodecContext {
      * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
      * than extradata_size to avoid problems if it is read with the bitstream reader.
      * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * Must be allocated with the av_malloc() family of functions.
      * - encoding: Set/allocated/freed by libavcodec.
      * - decoding: Set/allocated/freed by user.
      */
@@ -2009,15 +2057,19 @@ typedef struct AVCodecContext {
 
     /**
      * custom intra quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
+     * Must be allocated with the av_malloc() family of functions, and will be freed in
+     * avcodec_free_context().
+     * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
+     * - decoding: Set/allocated/freed by libavcodec.
      */
     uint16_t *intra_matrix;
 
     /**
      * custom inter quantization matrix
-     * - encoding: Set by user, can be NULL.
-     * - decoding: Set by libavcodec.
+     * Must be allocated with the av_malloc() family of functions, and will be freed in
+     * avcodec_free_context().
+     * - encoding: Set/allocated by user, freed by libavcodec. Can be NULL.
+     * - decoding: Set/allocated/freed by libavcodec.
      */
     uint16_t *inter_matrix;
 
@@ -2661,7 +2713,10 @@ typedef struct AVCodecContext {
     /**
      * opaque 64-bit number (generally a PTS) that will be reordered and
      * output in AVFrame.reordered_opaque
-     * - encoding: unused
+     * - encoding: Set by libavcodec to the reordered_opaque of the input
+     *             frame corresponding to the last returned packet. Only
+     *             supported by encoders with the
+     *             AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
      * - decoding: Set by user.
      */
     int64_t reordered_opaque;
@@ -2945,6 +3000,16 @@ typedef struct AVCodecContext {
 
 #define FF_PROFILE_SBC_MSBC                         1
 
+#define FF_PROFILE_PRORES_PROXY     0
+#define FF_PROFILE_PRORES_LT        1
+#define FF_PROFILE_PRORES_STANDARD  2
+#define FF_PROFILE_PRORES_HQ        3
+#define FF_PROFILE_PRORES_4444      4
+#define FF_PROFILE_PRORES_XQ        5
+
+#define FF_PROFILE_ARIB_PROFILE_A 0
+#define FF_PROFILE_ARIB_PROFILE_C 1
+
     /**
      * level
      * - encoding: Set by user.
@@ -3297,6 +3362,14 @@ typedef struct AVCodecContext {
      * used as reference pictures).
      */
     int extra_hw_frames;
+
+    /**
+     * The percentage of damaged samples to discard a frame.
+     *
+     * - decoding: set by user
+     * - encoding: unused
+     */
+    int discard_damaged_percentage;
 } AVCodecContext;
 
 #if FF_API_CODEC_GET_SET
@@ -4349,7 +4422,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by);
  * Initialize a reference-counted packet from av_malloc()ed data.
  *
  * @param pkt packet to be initialized. This function will set the data, size,
- *        buf and destruct fields, all others are left untouched.
+ *        and buf fields, all others are left untouched.
  * @param data Data allocated by av_malloc() to be used as packet data. If this
  *        function returns successfully, the data is owned by the underlying AVBuffer.
  *        The caller may not access the data through other means.
@@ -4855,6 +4928,9 @@ int avcodec_send_packet(AVCodecContext *avctx, const AVPacket *avpkt);
  *      AVERROR_EOF:       the decoder has been fully flushed, and there will be
  *                         no more output frames
  *      AVERROR(EINVAL):   codec not opened, or it is an encoder
+ *      AVERROR_INPUT_CHANGED:   current decoded frame has changed parameters
+ *                               with respect to first decoded frame. Applicable
+ *                               when flag AV_CODEC_FLAG_DROPCHANGED is set.
  *      other negative values: legitimate decoding errors
  */
 int avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame);
@@ -5766,6 +5842,7 @@ typedef struct AVBitStreamFilter {
     int (*init)(AVBSFContext *ctx);
     int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
     void (*close)(AVBSFContext *ctx);
+    void (*flush)(AVBSFContext *ctx);
 } AVBitStreamFilter;
 
 #if FF_API_OLD_BSF
@@ -5892,6 +5969,11 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
  */
 int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
 
+/**
+ * Reset the internal bitstream filter state / flush internal buffers.
+ */
+void av_bsf_flush(AVBSFContext *ctx);
+
 /**
  * Free a bitstream filter context and everything associated with it; write NULL
  * into the supplied pointer.

media/ffvpx/libavcodec/avpacket.c

@@ -112,7 +112,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
     av_assert0((unsigned)pkt->size <= INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
     if ((unsigned)grow_by >
         INT_MAX - (pkt->size + AV_INPUT_BUFFER_PADDING_SIZE))
-        return -1;
+        return AVERROR(ENOMEM);
 
     new_size = pkt->size + grow_by + AV_INPUT_BUFFER_PADDING_SIZE;
     if (pkt->buf) {
@@ -124,7 +124,7 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
         } else {
             data_offset = pkt->data - pkt->buf->data;
             if (data_offset > INT_MAX - new_size)
-                return -1;
+                return AVERROR(ENOMEM);
         }
 
         if (new_size + data_offset > pkt->buf->size) {
@@ -375,6 +375,9 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
     case AV_PKT_DATA_DISPLAYMATRIX:              return "Display Matrix";
     case AV_PKT_DATA_STEREO3D:                   return "Stereo 3D";
     case AV_PKT_DATA_AUDIO_SERVICE_TYPE:         return "Audio Service Type";
+    case AV_PKT_DATA_QUALITY_STATS:              return "Quality stats";
+    case AV_PKT_DATA_FALLBACK_TRACK:             return "Fallback track";
+    case AV_PKT_DATA_CPB_PROPERTIES:             return "CPB properties";
     case AV_PKT_DATA_SKIP_SAMPLES:               return "Skip Samples";
     case AV_PKT_DATA_JP_DUALMONO:                return "JP Dual Mono";
     case AV_PKT_DATA_STRINGS_METADATA:           return "Strings Metadata";
@@ -388,6 +391,9 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
     case AV_PKT_DATA_CONTENT_LIGHT_LEVEL:        return "Content light level metadata";
     case AV_PKT_DATA_SPHERICAL:                  return "Spherical Mapping";
     case AV_PKT_DATA_A53_CC:                     return "A53 Closed Captions";
+    case AV_PKT_DATA_ENCRYPTION_INIT_INFO:       return "Encryption initialization data";
+    case AV_PKT_DATA_ENCRYPTION_INFO:            return "Encryption info";
+    case AV_PKT_DATA_AFD:                        return "Active Format Description data";
     }
     return NULL;
 }
@@ -516,11 +522,12 @@ fail:
 
 int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict)
 {
-    const uint8_t *end = data + size;
+    const uint8_t *end;
     int ret = 0;
 
     if (!dict || !data || !size)
         return ret;
+    end = data + size;
     if (size && end[-1])
         return AVERROR_INVALIDDATA;
     while (data < end) {
@@ -574,10 +581,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
     dst->side_data            = NULL;
     dst->side_data_elems      = 0;
     for (i = 0; i < src->side_data_elems; i++) {
-         enum AVPacketSideDataType type = src->side_data[i].type;
-         int size          = src->side_data[i].size;
-         uint8_t *src_data = src->side_data[i].data;
-         uint8_t *dst_data = av_packet_new_side_data(dst, type, size);
+        enum AVPacketSideDataType type = src->side_data[i].type;
+        int size          = src->side_data[i].size;
+        uint8_t *src_data = src->side_data[i].data;
+        uint8_t *dst_data = av_packet_new_side_data(dst, type, size);
 
         if (!dst_data) {
             av_packet_free_side_data(dst);
@@ -610,6 +617,7 @@ int av_packet_ref(AVPacket *dst, const AVPacket *src)
         ret = packet_alloc(&dst->buf, src->size);
         if (ret < 0)
             goto fail;
+        av_assert1(!src->size || src->data);
         if (src->size)
             memcpy(dst->buf->data, src->data, src->size);
 
@@ -662,6 +670,7 @@ int av_packet_make_refcounted(AVPacket *pkt)
     ret = packet_alloc(&pkt->buf, pkt->size);
     if (ret < 0)
         return ret;
+    av_assert1(!pkt->size || pkt->data);
     if (pkt->size)
         memcpy(pkt->buf->data, pkt->data, pkt->size);
 
@@ -681,6 +690,7 @@ int av_packet_make_writable(AVPacket *pkt)
     ret = packet_alloc(&buf, pkt->size);
     if (ret < 0)
         return ret;
+    av_assert1(!pkt->size || pkt->data);
     if (pkt->size)
         memcpy(buf->data, pkt->data, pkt->size);
 

media/ffvpx/libavcodec/bitstream.c

@@ -164,7 +164,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
 
     table_size = 1 << table_nb_bits;
     if (table_nb_bits > 30)
-       return -1;
+       return AVERROR(EINVAL);
     table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC);
     ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size);
     if (table_index < 0)
@@ -188,8 +188,9 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
             }
             for (k = 0; k < nb; k++) {
                 int bits = table[j][1];
+                int oldsym  = table[j][0];
                 ff_dlog(NULL, "%4x: code=%d n=%d\n", j, i, n);
-                if (bits != 0 && bits != n) {
+                if ((bits || oldsym) && (bits != n || oldsym != symbol)) {
                     av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
                     return AVERROR_INVALIDDATA;
                 }
@@ -226,6 +227,10 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
             /* note: realloc has been done, so reload tables */
             table = (volatile VLC_TYPE (*)[2])&vlc->table[table_index];
             table[j][0] = index; //code
+            if (table[j][0] != index) {
+                avpriv_request_sample(NULL, "strange codes");
+                return AVERROR_PATCHWELCOME;
+            }
             i = k-1;
         }
     }
@@ -306,7 +311,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes,
             av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\
             if (!(flags & INIT_VLC_USE_NEW_STATIC))                         \
                 av_free(buf);                                               \
-            return -1;                                                      \
+            return AVERROR(EINVAL);                                         \
         }                                                                   \
         GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);            \
         if (buf[j].code >= (1LL<<buf[j].bits)) {                            \
@@ -314,7 +319,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes,
                    "init_vlc\n", buf[j].code, i);                           \
             if (!(flags & INIT_VLC_USE_NEW_STATIC))                         \
                 av_free(buf);                                               \
-            return -1;                                                      \
+            return AVERROR(EINVAL);                                         \
         }                                                                   \
         if (flags & INIT_VLC_LE)                                            \
             buf[j].code = bitswap_32(buf[j].code);                          \

media/ffvpx/libavcodec/bitstream_filters.c

@@ -25,6 +25,8 @@
 #include "bsf.h"
 
 extern const AVBitStreamFilter ff_aac_adtstoasc_bsf;
+extern const AVBitStreamFilter ff_av1_frame_split_bsf;
+extern const AVBitStreamFilter ff_av1_metadata_bsf;
 extern const AVBitStreamFilter ff_chomp_bsf;
 extern const AVBitStreamFilter ff_dump_extradata_bsf;
 extern const AVBitStreamFilter ff_dca_core_bsf;
@@ -46,9 +48,12 @@ extern const AVBitStreamFilter ff_mpeg4_unpack_bframes_bsf;
 extern const AVBitStreamFilter ff_mov2textsub_bsf;
 extern const AVBitStreamFilter ff_noise_bsf;
 extern const AVBitStreamFilter ff_null_bsf;
+extern const AVBitStreamFilter ff_prores_metadata_bsf;
 extern const AVBitStreamFilter ff_remove_extradata_bsf;
 extern const AVBitStreamFilter ff_text2movsub_bsf;
 extern const AVBitStreamFilter ff_trace_headers_bsf;
+extern const AVBitStreamFilter ff_truehd_core_bsf;
+extern const AVBitStreamFilter ff_vp9_metadata_bsf;
 extern const AVBitStreamFilter ff_vp9_raw_reorder_bsf;
 extern const AVBitStreamFilter ff_vp9_superframe_bsf;
 extern const AVBitStreamFilter ff_vp9_superframe_split_bsf;

media/ffvpx/libavcodec/bsf.c

@@ -47,7 +47,8 @@ void av_bsf_free(AVBSFContext **pctx)
 
     av_opt_free(ctx);
 
-    av_packet_free(&ctx->internal->buffer_pkt);
+    if (ctx->internal)
+        av_packet_free(&ctx->internal->buffer_pkt);
     av_freep(&ctx->internal);
     av_freep(&ctx->priv_data);
 
@@ -172,6 +173,16 @@ int av_bsf_init(AVBSFContext *ctx)
     return 0;
 }
 
+void av_bsf_flush(AVBSFContext *ctx)
+{
+    ctx->internal->eof = 0;
+
+    av_packet_unref(ctx->internal->buffer_pkt);
+
+    if (ctx->filter->flush)
+        ctx->filter->flush(ctx);
+}
+
 int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
 {
     int ret;
@@ -340,6 +351,15 @@ static int bsf_list_filter(AVBSFContext *bsf, AVPacket *out)
     return ret;
 }
 
+static void bsf_list_flush(AVBSFContext *bsf)
+{
+    BSFListContext *lst = bsf->priv_data;
+
+    for (int i = 0; i < lst->nb_bsfs; i++)
+        av_bsf_flush(lst->bsfs[i]);
+    lst->idx = lst->flushed_idx = 0;
+}
+
 static void bsf_list_close(AVBSFContext *bsf)
 {
     BSFListContext *lst = bsf->priv_data;
@@ -388,6 +408,7 @@ const AVBitStreamFilter ff_list_bsf = {
         .priv_class     = &bsf_list_class,
         .init           = bsf_list_init,
         .filter         = bsf_list_filter,
+        .flush          = bsf_list_flush,
         .close          = bsf_list_close,
 };
 

media/ffvpx/libavcodec/codec_desc.c

@@ -81,6 +81,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
         .mime_types= MT("image/jpeg"),
+        .profiles  = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles),
     },
     {
         .id        = AV_CODEC_ID_MJPEGB,
@@ -722,7 +723,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .id        = AV_CODEC_ID_GIF,
         .type      = AVMEDIA_TYPE_VIDEO,
         .name      = "gif",
-        .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
+        .long_name = NULL_IF_CONFIG_SMALL("CompuServe GIF (Graphics Interchange Format)"),
         .props     = AV_CODEC_PROP_LOSSLESS,
         .mime_types= MT("image/gif"),
     },
@@ -1077,6 +1078,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .name      = "prores",
         .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+        .profiles  = NULL_IF_CONFIG_SMALL(ff_prores_profiles),
     },
     {
         .id        = AV_CODEC_ID_JV,
@@ -1394,6 +1396,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"),
         .props     = AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_AVS2,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "avs2",
+        .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
     {
         .id        = AV_CODEC_ID_Y41P,
         .type      = AVMEDIA_TYPE_VIDEO,
@@ -1516,7 +1525,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .type      = AVMEDIA_TYPE_VIDEO,
         .name      = "truemotion2rt",
         .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0 Real Time"),
-        .props     = AV_CODEC_PROP_LOSSY,
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
     },
     {
         .id        = AV_CODEC_ID_M101,
@@ -1647,6 +1656,76 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("FITS (Flexible Image Transport System)"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_IMM4,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "imm4",
+        .long_name = NULL_IF_CONFIG_SMALL("Infinity IMM4"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_PROSUMER,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "prosumer",
+        .long_name = NULL_IF_CONFIG_SMALL("Brooktree ProSumer Video"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_MWSC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "mwsc",
+        .long_name = NULL_IF_CONFIG_SMALL("MatchWare Screen Capture Codec"),
+        .props     = AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_WCMV,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "wcmv",
+        .long_name = NULL_IF_CONFIG_SMALL("WinCAM Motion Video"),
+        .props     = AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_RASC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "rasc",
+        .long_name = NULL_IF_CONFIG_SMALL("RemotelyAnywhere Screen Capture"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_HYMT,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "hymt",
+        .long_name = NULL_IF_CONFIG_SMALL("HuffYUV MT"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
+    },
+    {
+        .id        = AV_CODEC_ID_ARBC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "arbc",
+        .long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_AGM,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "agm",
+        .long_name = NULL_IF_CONFIG_SMALL("Amuse Graphics Movie"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_LSCR,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "lscr",
+        .long_name = NULL_IF_CONFIG_SMALL("LEAD Screen Capture"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_VP4,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "vp4",
+        .long_name = NULL_IF_CONFIG_SMALL("On2 VP4"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* various PCM "codecs" */
     {
@@ -1894,6 +1973,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("PCM 24.0 floating point little-endian"),
         .props     = AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_PCM_VIDC,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "pcm_vidc",
+        .long_name = NULL_IF_CONFIG_SMALL("PCM Archimedes VIDC"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* various ADPCM codecs */
     {
@@ -2183,6 +2269,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("ADPCM MTAF"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_ADPCM_AGM,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "adpcm_agm",
+        .long_name = NULL_IF_CONFIG_SMALL("ADPCM AmuseGraphics Movie AGM"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* AMR */
     {
@@ -2878,6 +2971,20 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("SBC (low-complexity subband codec)"),
         .props     = AV_CODEC_PROP_LOSSY,
     },
+    {
+        .id        = AV_CODEC_ID_ATRAC9,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "atrac9",
+        .long_name = NULL_IF_CONFIG_SMALL("ATRAC9 (Adaptive TRansform Acoustic Coding 9)"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
+    {
+        .id        = AV_CODEC_ID_HCOM,
+        .type      = AVMEDIA_TYPE_AUDIO,
+        .name      = "hcom",
+        .long_name = NULL_IF_CONFIG_SMALL("HCOM Audio"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
 
     /* subtitle codecs */
     {
@@ -3047,6 +3154,21 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"),
         .props     = AV_CODEC_PROP_TEXT_SUB,
     },
+    {
+        .id        = AV_CODEC_ID_TTML,
+        .type      = AVMEDIA_TYPE_SUBTITLE,
+        .name      = "ttml",
+        .long_name = NULL_IF_CONFIG_SMALL("Timed Text Markup Language"),
+        .props     = AV_CODEC_PROP_TEXT_SUB,
+    },
+    {
+        .id        = AV_CODEC_ID_ARIB_CAPTION,
+        .type      = AVMEDIA_TYPE_SUBTITLE,
+        .name      = "arib_caption",
+        .long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"),
+        .props     = AV_CODEC_PROP_TEXT_SUB,
+        .profiles  = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles),
+    },
 
     /* other kind of codecs and pseudo-codecs */
     {

media/ffvpx/libavcodec/decode.c

@@ -36,6 +36,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/intmath.h"
+#include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
@@ -181,7 +182,7 @@ static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
     return 0;
 }
 
-static int bsfs_init(AVCodecContext *avctx)
+int ff_decode_bsfs_init(AVCodecContext *avctx)
 {
     AVCodecInternal *avci = avctx->internal;
     DecodeFilterContext *s = &avci->filter;
@@ -195,27 +196,33 @@ static int bsfs_init(AVCodecContext *avctx)
     while (bsfs_str && *bsfs_str) {
         AVBSFContext **tmp;
         const AVBitStreamFilter *filter;
-        char *bsf;
+        char *bsf, *bsf_options_str, *bsf_name;
 
         bsf = av_get_token(&bsfs_str, ",");
         if (!bsf) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
+        bsf_name = av_strtok(bsf, "=", &bsf_options_str);
+        if (!bsf_name) {
+            av_freep(&bsf);
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
 
-        filter = av_bsf_get_by_name(bsf);
+        filter = av_bsf_get_by_name(bsf_name);
         if (!filter) {
             av_log(avctx, AV_LOG_ERROR, "A non-existing bitstream filter %s "
                    "requested by a decoder. This is a bug, please report it.\n",
-                   bsf);
-            ret = AVERROR_BUG;
+                   bsf_name);
             av_freep(&bsf);
+            ret = AVERROR_BUG;
             goto fail;
         }
-        av_freep(&bsf);
 
         tmp = av_realloc_array(s->bsfs, s->nb_bsfs + 1, sizeof(*s->bsfs));
         if (!tmp) {
+            av_freep(&bsf);
             ret = AVERROR(ENOMEM);
             goto fail;
         }
@@ -223,8 +230,10 @@ static int bsfs_init(AVCodecContext *avctx)
         s->nb_bsfs++;
 
         ret = av_bsf_alloc(filter, &s->bsfs[s->nb_bsfs - 1]);
-        if (ret < 0)
+        if (ret < 0) {
+            av_freep(&bsf);
             goto fail;
+        }
 
         if (s->nb_bsfs == 1) {
             /* We do not currently have an API for passing the input timebase into decoders,
@@ -238,12 +247,38 @@ static int bsfs_init(AVCodecContext *avctx)
             ret = avcodec_parameters_copy(s->bsfs[s->nb_bsfs - 1]->par_in,
                                           s->bsfs[s->nb_bsfs - 2]->par_out);
         }
-        if (ret < 0)
+        if (ret < 0) {
+            av_freep(&bsf);
             goto fail;
+        }
+
+        if (bsf_options_str && filter->priv_class) {
+            const AVOption *opt = av_opt_next(s->bsfs[s->nb_bsfs - 1]->priv_data, NULL);
+            const char * shorthand[2] = {NULL};
+
+            if (opt)
+                shorthand[0] = opt->name;
+
+            ret = av_opt_set_from_string(s->bsfs[s->nb_bsfs - 1]->priv_data, bsf_options_str, shorthand, "=", ":");
+            if (ret < 0) {
+                if (ret != AVERROR(ENOMEM)) {
+                    av_log(avctx, AV_LOG_ERROR, "Invalid options for bitstream filter %s "
+                           "requested by the decoder. This is a bug, please report it.\n",
+                           bsf_name);
+                    ret = AVERROR_BUG;
+                }
+                av_freep(&bsf);
+                goto fail;
+            }
+        }
+        av_freep(&bsf);
 
         ret = av_bsf_init(s->bsfs[s->nb_bsfs - 1]);
         if (ret < 0)
             goto fail;
+
+        if (*bsfs_str)
+            bsfs_str++;
     }
 
     return 0;
@@ -653,10 +688,6 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
     if (avpkt && !avpkt->size && avpkt->data)
         return AVERROR(EINVAL);
 
-    ret = bsfs_init(avctx);
-    if (ret < 0)
-        return ret;
-
     av_packet_unref(avci->buffer_pkt);
     if (avpkt && (avpkt->data || avpkt->side_data_elems)) {
         ret = av_packet_ref(avci->buffer_pkt, avpkt);
@@ -709,17 +740,13 @@ static int apply_cropping(AVCodecContext *avctx, AVFrame *frame)
 int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)
 {
     AVCodecInternal *avci = avctx->internal;
-    int ret;
+    int ret, changed;
 
     av_frame_unref(frame);
 
     if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec))
         return AVERROR(EINVAL);
 
-    ret = bsfs_init(avctx);
-    if (ret < 0)
-        return ret;
-
     if (avci->buffer_frame->buf[0]) {
         av_frame_move_ref(frame, avci->buffer_frame);
     } else {
@@ -738,6 +765,51 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr
 
     avctx->frame_number++;
 
+    if (avctx->flags & AV_CODEC_FLAG_DROPCHANGED) {
+
+        if (avctx->frame_number == 1) {
+            avci->initial_format = frame->format;
+            switch(avctx->codec_type) {
+            case AVMEDIA_TYPE_VIDEO:
+                avci->initial_width  = frame->width;
+                avci->initial_height = frame->height;
+                break;
+            case AVMEDIA_TYPE_AUDIO:
+                avci->initial_sample_rate = frame->sample_rate ? frame->sample_rate :
+                                                                 avctx->sample_rate;
+                avci->initial_channels       = frame->channels;
+                avci->initial_channel_layout = frame->channel_layout;
+                break;
+            }
+        }
+
+        if (avctx->frame_number > 1) {
+            changed = avci->initial_format != frame->format;
+
+           switch(avctx->codec_type) {
+            case AVMEDIA_TYPE_VIDEO:
+                changed |= avci->initial_width  != frame->width ||
+                           avci->initial_height != frame->height;
+                break;
+            case AVMEDIA_TYPE_AUDIO:
+                changed |= avci->initial_sample_rate    != frame->sample_rate ||
+                           avci->initial_sample_rate    != avctx->sample_rate ||
+                           avci->initial_channels       != frame->channels ||
+                           avci->initial_channel_layout != frame->channel_layout;
+                break;
+            }
+
+            if (changed) {
+                avci->changed_frames_dropped++;
+                av_log(avctx, AV_LOG_INFO, "dropped changed frame #%d pts %"PRId64
+                                            " drop count: %d \n",
+                                            avctx->frame_number, frame->pts,
+                                            avci->changed_frames_dropped);
+                av_frame_unref(frame);
+                return AVERROR_INPUT_CHANGED;
+            }
+        }
+    }
     return 0;
 }
 
@@ -1351,6 +1423,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
         if (i == n) {
             av_log(avctx, AV_LOG_ERROR, "Invalid return from get_format(): "
                    "%s not in possible list.\n", desc->name);
+            ret = AV_PIX_FMT_NONE;
             break;
         }
 
@@ -1469,7 +1542,7 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame)
         tmpsize = av_image_fill_pointers(data, avctx->pix_fmt, h,
                                          NULL, linesize);
         if (tmpsize < 0)
-            return -1;
+            return tmpsize;
 
         for (i = 0; i < 3 && data[i + 1]; i++)
             size[i] = data[i + 1] - data[i];
@@ -1837,7 +1910,7 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
     int ret;
 
     if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
-        if ((ret = av_image_check_size2(avctx->width, avctx->height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx)) < 0 || avctx->pix_fmt<0) {
+        if ((ret = av_image_check_size2(FFALIGN(avctx->width, STRIDE_ALIGN), avctx->height, avctx->max_pixels, AV_PIX_FMT_NONE, 0, avctx)) < 0 || avctx->pix_fmt<0) {
             av_log(avctx, AV_LOG_ERROR, "video_get_buffer: image parameters invalid\n");
             return AVERROR(EINVAL);
         }
@@ -1943,6 +2016,14 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
     return ret;
 }
 
+static void bsfs_flush(AVCodecContext *avctx)
+{
+    DecodeFilterContext *s = &avctx->internal->filter;
+
+    for (int i = 0; i < s->nb_bsfs; i++)
+        av_bsf_flush(s->bsfs[i]);
+}
+
 void avcodec_flush_buffers(AVCodecContext *avctx)
 {
     avctx->internal->draining      = 0;
@@ -1963,7 +2044,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
     avctx->pts_correction_last_pts =
     avctx->pts_correction_last_dts = INT64_MIN;
 
-    ff_decode_bsfs_uninit(avctx);
+    bsfs_flush(avctx);
 
     if (!avctx->refcounted_frames)
         av_frame_unref(avctx->internal->to_free);

media/ffvpx/libavcodec/decode.h

@@ -64,6 +64,8 @@ typedef struct FrameDecodeData {
  */
 int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt);
 
+int ff_decode_bsfs_init(AVCodecContext *avctx);
+
 void ff_decode_bsfs_uninit(AVCodecContext *avctx);
 
 /**

media/ffvpx/libavcodec/fft_template.c

@@ -261,17 +261,41 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
     if (s->fft_permutation == FF_FFT_PERM_AVX) {
         fft_perm_avx(s);
     } else {
-        for(i=0; i<n; i++) {
-            int k;
-            j = i;
-            if (s->fft_permutation == FF_FFT_PERM_SWAP_LSBS)
-                j = (j&~3) | ((j>>1)&1) | ((j<<1)&2);
-            k = -split_radix_permutation(i, n, s->inverse) & (n-1);
-            if (s->revtab)
-                s->revtab[k] = j;
-            if (s->revtab32)
-                s->revtab32[k] = j;
-        }
+#define PROCESS_FFT_PERM_SWAP_LSBS(num) do {\
+    for(i = 0; i < n; i++) {\
+        int k;\
+        j = i;\
+        j = (j & ~3) | ((j >> 1) & 1) | ((j << 1) & 2);\
+        k = -split_radix_permutation(i, n, s->inverse) & (n - 1);\
+        s->revtab##num[k] = j;\
+    } \
+} while(0);
+
+#define PROCESS_FFT_PERM_DEFAULT(num) do {\
+    for(i = 0; i < n; i++) {\
+        int k;\
+        j = i;\
+        k = -split_radix_permutation(i, n, s->inverse) & (n - 1);\
+        s->revtab##num[k] = j;\
+    } \
+} while(0);
+
+#define SPLIT_RADIX_PERMUTATION(num) do { \
+    if (s->fft_permutation == FF_FFT_PERM_SWAP_LSBS) {\
+        PROCESS_FFT_PERM_SWAP_LSBS(num) \
+    } else {\
+        PROCESS_FFT_PERM_DEFAULT(num) \
+    }\
+} while(0);
+
+    if (s->revtab)
+        SPLIT_RADIX_PERMUTATION()
+    if (s->revtab32)
+        SPLIT_RADIX_PERMUTATION(32)
+
+#undef PROCESS_FFT_PERM_DEFAULT
+#undef PROCESS_FFT_PERM_SWAP_LSBS
+#undef SPLIT_RADIX_PERMUTATION
     }
 
     return 0;
@@ -523,9 +547,11 @@ static void name(FFTComplex *z, const FFTSample *wre, unsigned int n)\
 }
 
 PASS(pass)
+#if !CONFIG_SMALL
 #undef BUTTERFLIES
 #define BUTTERFLIES BUTTERFLIES_BIG
 PASS(pass_big)
+#endif
 
 #define DECL_FFT(n,n2,n4)\
 static void fft##n(FFTComplex *z)\

media/ffvpx/libavcodec/get_bits.h

@@ -1,5 +1,6 @@
 /*
- * copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2016 Alexandra Hájková
  *
  * This file is part of FFmpeg.
  *
@@ -53,13 +54,25 @@
 #define UNCHECKED_BITSTREAM_READER !CONFIG_SAFE_BITSTREAM_READER
 #endif
 
+#ifndef CACHED_BITSTREAM_READER
+#define CACHED_BITSTREAM_READER 0
+#endif
+
 typedef struct GetBitContext {
     const uint8_t *buffer, *buffer_end;
+#if CACHED_BITSTREAM_READER
+    uint64_t cache;
+    unsigned bits_left;
+#endif
     int index;
     int size_in_bits;
     int size_in_bits_plus8;
 } GetBitContext;
 
+static inline unsigned int get_bits(GetBitContext *s, int n);
+static inline void skip_bits(GetBitContext *s, int n);
+static inline unsigned int show_bits(GetBitContext *s, int n);
+
 /* Bitstream reader API docs:
  * name
  *   arbitrary name which is used as prefix for the internal variables
@@ -107,12 +120,16 @@ typedef struct GetBitContext {
  * For examples see get_bits, show_bits, skip_bits, get_vlc.
  */
 
-#ifdef LONG_BITSTREAM_READER
+#if CACHED_BITSTREAM_READER
+#   define MIN_CACHE_BITS 64
+#elif defined LONG_BITSTREAM_READER
 #   define MIN_CACHE_BITS 32
 #else
 #   define MIN_CACHE_BITS 25
 #endif
 
+#if !CACHED_BITSTREAM_READER
+
 #define OPEN_READER_NOSIZE(name, gb)            \
     unsigned int name ## _index = (gb)->index;  \
     unsigned int av_unused name ## _cache
@@ -197,11 +214,73 @@ typedef struct GetBitContext {
 
 #define GET_CACHE(name, gb) ((uint32_t) name ## _cache)
 
+#endif
+
 static inline int get_bits_count(const GetBitContext *s)
 {
+#if CACHED_BITSTREAM_READER
+    return s->index - s->bits_left;
+#else
     return s->index;
+#endif
 }
 
+#if CACHED_BITSTREAM_READER
+static inline void refill_32(GetBitContext *s, int is_le)
+{
+#if !UNCHECKED_BITSTREAM_READER
+    if (s->index >> 3 >= s->buffer_end - s->buffer)
+        return;
+#endif
+
+    if (is_le)
+    s->cache       = (uint64_t)AV_RL32(s->buffer + (s->index >> 3)) << s->bits_left | s->cache;
+    else
+    s->cache       = s->cache | (uint64_t)AV_RB32(s->buffer + (s->index >> 3)) << (32 - s->bits_left);
+    s->index     += 32;
+    s->bits_left += 32;
+}
+
+static inline void refill_64(GetBitContext *s, int is_le)
+{
+#if !UNCHECKED_BITSTREAM_READER
+    if (s->index >> 3 >= s->buffer_end - s->buffer)
+        return;
+#endif
+
+    if (is_le)
+    s->cache = AV_RL64(s->buffer + (s->index >> 3));
+    else
+    s->cache = AV_RB64(s->buffer + (s->index >> 3));
+    s->index += 64;
+    s->bits_left = 64;
+}
+
+static inline uint64_t get_val(GetBitContext *s, unsigned n, int is_le)
+{
+    uint64_t ret;
+    av_assert2(n>0 && n<=63);
+    if (is_le) {
+        ret = s->cache & ((UINT64_C(1) << n) - 1);
+        s->cache >>= n;
+    } else {
+        ret = s->cache >> (64 - n);
+        s->cache <<= n;
+    }
+    s->bits_left -= n;
+    return ret;
+}
+
+static inline unsigned show_val(const GetBitContext *s, unsigned n)
+{
+#ifdef BITSTREAM_READER_LE
+    return s->cache & ((UINT64_C(1) << n) - 1);
+#else
+    return s->cache >> (64 - n);
+#endif
+}
+#endif
+
 /**
  * Skips the specified number of bits.
  * @param n the number of bits to skip,
@@ -211,13 +290,29 @@ static inline int get_bits_count(const GetBitContext *s)
  */
 static inline void skip_bits_long(GetBitContext *s, int n)
 {
+#if CACHED_BITSTREAM_READER
+    skip_bits(s, n);
+#else
 #if UNCHECKED_BITSTREAM_READER
     s->index += n;
 #else
     s->index += av_clip(n, -s->index, s->size_in_bits_plus8 - s->index);
 #endif
+#endif
 }
 
+#if CACHED_BITSTREAM_READER
+static inline void skip_remaining(GetBitContext *s, unsigned n)
+{
+#ifdef BITSTREAM_READER_LE
+    s->cache >>= n;
+#else
+    s->cache <<= n;
+#endif
+    s->bits_left -= n;
+}
+#endif
+
 /**
  * Read MPEG-1 dc-style VLC (sign bit + mantissa with no MSB).
  * if MSB not set it is negative
@@ -225,6 +320,13 @@ static inline void skip_bits_long(GetBitContext *s, int n)
  */
 static inline int get_xbits(GetBitContext *s, int n)
 {
+#if CACHED_BITSTREAM_READER
+    int32_t cache = show_bits(s, 32);
+    int sign = ~cache >> 31;
+    skip_remaining(s, n);
+
+    return ((((uint32_t)(sign ^ cache)) >> (32 - n)) ^ sign) - sign;
+#else
     register int sign;
     register int32_t cache;
     OPEN_READER(re, s);
@@ -235,8 +337,10 @@ static inline int get_xbits(GetBitContext *s, int n)
     LAST_SKIP_BITS(re, s, n);
     CLOSE_READER(re, s);
     return (NEG_USR32(sign ^ cache, n) ^ sign) - sign;
+#endif
 }
 
+#if !CACHED_BITSTREAM_READER
 static inline int get_xbits_le(GetBitContext *s, int n)
 {
     register int sign;
@@ -250,16 +354,22 @@ static inline int get_xbits_le(GetBitContext *s, int n)
     CLOSE_READER(re, s);
     return (zero_extend(sign ^ cache, n) ^ sign) - sign;
 }
+#endif
 
 static inline int get_sbits(GetBitContext *s, int n)
 {
     register int tmp;
+#if CACHED_BITSTREAM_READER
+    av_assert2(n>0 && n<=25);
+    tmp = sign_extend(get_bits(s, n), n);
+#else
     OPEN_READER(re, s);
     av_assert2(n>0 && n<=25);
     UPDATE_CACHE(re, s);
     tmp = SHOW_SBITS(re, s, n);
     LAST_SKIP_BITS(re, s, n);
     CLOSE_READER(re, s);
+#endif
     return tmp;
 }
 
@@ -268,13 +378,34 @@ static inline int get_sbits(GetBitContext *s, int n)
  */
 static inline unsigned int get_bits(GetBitContext *s, int n)
 {
-    register int tmp;
+    register unsigned int tmp;
+#if CACHED_BITSTREAM_READER
+
+    av_assert2(n>0 && n<=32);
+    if (n > s->bits_left) {
+#ifdef BITSTREAM_READER_LE
+        refill_32(s, 1);
+#else
+        refill_32(s, 0);
+#endif
+        if (s->bits_left < 32)
+            s->bits_left = n;
+    }
+
+#ifdef BITSTREAM_READER_LE
+    tmp = get_val(s, n, 1);
+#else
+    tmp = get_val(s, n, 0);
+#endif
+#else
     OPEN_READER(re, s);
     av_assert2(n>0 && n<=25);
     UPDATE_CACHE(re, s);
     tmp = SHOW_UBITS(re, s, n);
     LAST_SKIP_BITS(re, s, n);
     CLOSE_READER(re, s);
+#endif
+    av_assert2(tmp < UINT64_C(1) << n);
     return tmp;
 }
 
@@ -288,6 +419,16 @@ static av_always_inline int get_bitsz(GetBitContext *s, int n)
 
 static inline unsigned int get_bits_le(GetBitContext *s, int n)
 {
+#if CACHED_BITSTREAM_READER
+    av_assert2(n>0 && n<=32);
+    if (n > s->bits_left) {
+        refill_32(s, 1);
+        if (s->bits_left < 32)
+            s->bits_left = n;
+    }
+
+    return get_val(s, n, 1);
+#else
     register int tmp;
     OPEN_READER(re, s);
     av_assert2(n>0 && n<=25);
@@ -296,6 +437,7 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n)
     LAST_SKIP_BITS(re, s, n);
     CLOSE_READER(re, s);
     return tmp;
+#endif
 }
 
 /**
@@ -303,23 +445,72 @@ static inline unsigned int get_bits_le(GetBitContext *s, int n)
  */
 static inline unsigned int show_bits(GetBitContext *s, int n)
 {
-    register int tmp;
+    register unsigned int tmp;
+#if CACHED_BITSTREAM_READER
+    if (n > s->bits_left)
+#ifdef BITSTREAM_READER_LE
+        refill_32(s, 1);
+#else
+        refill_32(s, 0);
+#endif
+
+    tmp = show_val(s, n);
+#else
     OPEN_READER_NOSIZE(re, s);
     av_assert2(n>0 && n<=25);
     UPDATE_CACHE(re, s);
     tmp = SHOW_UBITS(re, s, n);
+#endif
     return tmp;
 }
 
 static inline void skip_bits(GetBitContext *s, int n)
 {
+#if CACHED_BITSTREAM_READER
+    if (n < s->bits_left)
+        skip_remaining(s, n);
+    else {
+        n -= s->bits_left;
+        s->cache = 0;
+        s->bits_left = 0;
+
+        if (n >= 64) {
+            unsigned skip = (n / 8) * 8;
+
+            n -= skip;
+            s->index += skip;
+        }
+#ifdef BITSTREAM_READER_LE
+        refill_64(s, 1);
+#else
+        refill_64(s, 0);
+#endif
+        if (n)
+            skip_remaining(s, n);
+    }
+#else
     OPEN_READER(re, s);
     LAST_SKIP_BITS(re, s, n);
     CLOSE_READER(re, s);
+#endif
 }
 
 static inline unsigned int get_bits1(GetBitContext *s)
 {
+#if CACHED_BITSTREAM_READER
+    if (!s->bits_left)
+#ifdef BITSTREAM_READER_LE
+        refill_64(s, 1);
+#else
+        refill_64(s, 0);
+#endif
+
+#ifdef BITSTREAM_READER_LE
+    return get_val(s, 1, 1);
+#else
+    return get_val(s, 1, 0);
+#endif
+#else
     unsigned int index = s->index;
     uint8_t result     = s->buffer[index >> 3];
 #ifdef BITSTREAM_READER_LE
@@ -336,6 +527,7 @@ static inline unsigned int get_bits1(GetBitContext *s)
     s->index = index;
 
     return result;
+#endif
 }
 
 static inline unsigned int show_bits1(GetBitContext *s)
@@ -356,6 +548,10 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
     av_assert2(n>=0 && n<=32);
     if (!n) {
         return 0;
+#if CACHED_BITSTREAM_READER
+    }
+    return get_bits(s, n);
+#else
     } else if (n <= MIN_CACHE_BITS) {
         return get_bits(s, n);
     } else {
@@ -367,6 +563,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
         return ret | get_bits(s, n - 16);
 #endif
     }
+#endif
 }
 
 /**
@@ -422,16 +619,8 @@ static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
     return bit;
 }
 
-/**
- * Initialize GetBitContext.
- * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes
- *        larger than the actual read bits because some optimized bitstream
- *        readers read 32 or 64 bit at once and could read over the end
- * @param bit_size the size of the buffer in bits
- * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow.
- */
-static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
-                                int bit_size)
+static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer,
+                                   int bit_size, int is_le)
 {
     int buffer_size;
     int ret = 0;
@@ -450,9 +639,33 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
     s->buffer_end         = buffer + buffer_size;
     s->index              = 0;
 
+#if CACHED_BITSTREAM_READER
+    s->cache              = 0;
+    s->bits_left          = 0;
+    refill_64(s, is_le);
+#endif
+
     return ret;
 }
 
+/**
+ * Initialize GetBitContext.
+ * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes
+ *        larger than the actual read bits because some optimized bitstream
+ *        readers read 32 or 64 bit at once and could read over the end
+ * @param bit_size the size of the buffer in bits
+ * @return 0 on success, AVERROR_INVALIDDATA if the buffer_size would overflow.
+ */
+static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
+                                int bit_size)
+{
+#ifdef BITSTREAM_READER_LE
+    return init_get_bits_xe(s, buffer, bit_size, 1);
+#else
+    return init_get_bits_xe(s, buffer, bit_size, 0);
+#endif
+}
+
 /**
  * Initialize GetBitContext.
  * @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes
@@ -469,6 +682,14 @@ static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer,
     return init_get_bits(s, buffer, byte_size * 8);
 }
 
+static inline int init_get_bits8_le(GetBitContext *s, const uint8_t *buffer,
+                                    int byte_size)
+{
+    if (byte_size > INT_MAX / 8 || byte_size < 0)
+        byte_size = -1;
+    return init_get_bits_xe(s, buffer, byte_size * 8, 1);
+}
+
 static inline const uint8_t *align_get_bits(GetBitContext *s)
 {
     int n = -get_bits_count(s) & 7;
@@ -551,6 +772,19 @@ static inline const uint8_t *align_get_bits(GetBitContext *s)
         SKIP_BITS(name, gb, n);                                 \
     } while (0)
 
+/* Return the LUT element for the given bitstream configuration. */
+static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits,
+                          VLC_TYPE (*table)[2])
+{
+    unsigned idx;
+
+    *nb_bits = -*n;
+    idx = show_bits(s, *nb_bits) + code;
+    *n = table[idx][1];
+
+    return table[idx][0];
+}
+
 /**
  * Parse a vlc code.
  * @param bits is the number of bits which will be read at once, must be
@@ -563,6 +797,24 @@ static inline const uint8_t *align_get_bits(GetBitContext *s)
 static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
                                      int bits, int max_depth)
 {
+#if CACHED_BITSTREAM_READER
+    int nb_bits;
+    unsigned idx = show_bits(s, bits);
+    int code = table[idx][0];
+    int n    = table[idx][1];
+
+    if (max_depth > 1 && n < 0) {
+        skip_remaining(s, bits);
+        code = set_idx(s, code, &n, &nb_bits, table);
+        if (max_depth > 2 && n < 0) {
+            skip_remaining(s, nb_bits);
+            code = set_idx(s, code, &n, &nb_bits, table);
+        }
+    }
+    skip_remaining(s, n);
+
+    return code;
+#else
     int code;
 
     OPEN_READER(re, s);
@@ -573,6 +825,7 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
     CLOSE_READER(re, s);
 
     return code;
+#endif
 }
 
 static inline int decode012(GetBitContext *gb)

media/ffvpx/libavcodec/golomb.h

@@ -49,11 +49,30 @@ extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256];
 
 /**
  * Read an unsigned Exp-Golomb code in the range 0 to 8190.
+ *
+ * @returns the read value or a negative error code.
  */
 static inline int get_ue_golomb(GetBitContext *gb)
 {
     unsigned int buf;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    if (buf >= (1 << 27)) {
+        buf >>= 32 - 9;
+        skip_bits_long(gb, ff_golomb_vlc_len[buf]);
+
+        return ff_ue_golomb_vlc_code[buf];
+    } else {
+        int log = 2 * av_log2(buf) - 31;
+        buf >>= log;
+        buf--;
+        skip_bits_long(gb, 32 - log);
+
+        return buf;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -77,6 +96,7 @@ static inline int get_ue_golomb(GetBitContext *gb)
 
         return buf;
     }
+#endif
 }
 
 /**
@@ -101,6 +121,13 @@ static inline int get_ue_golomb_31(GetBitContext *gb)
 {
     unsigned int buf;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    buf >>= 32 - 9;
+    skip_bits_long(gb, ff_golomb_vlc_len[buf]);
+#else
+
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -108,6 +135,7 @@ static inline int get_ue_golomb_31(GetBitContext *gb)
     buf >>= 32 - 9;
     LAST_SKIP_BITS(re, gb, ff_golomb_vlc_len[buf]);
     CLOSE_READER(re, gb);
+#endif
 
     return ff_ue_golomb_vlc_code[buf];
 }
@@ -116,6 +144,33 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb)
 {
     uint32_t buf;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    if (buf & 0xAA800000) {
+        buf >>= 32 - 8;
+        skip_bits_long(gb, ff_interleaved_golomb_vlc_len[buf]);
+
+        return ff_interleaved_ue_golomb_vlc_code[buf];
+    } else {
+        unsigned ret = 1;
+
+        do {
+            buf >>= 32 - 8;
+            skip_bits_long(gb, FFMIN(ff_interleaved_golomb_vlc_len[buf], 8));
+
+            if (ff_interleaved_golomb_vlc_len[buf] != 9) {
+                ret <<= (ff_interleaved_golomb_vlc_len[buf] - 1) >> 1;
+                ret  |= ff_interleaved_dirac_golomb_vlc_code[buf];
+                break;
+            }
+            ret = (ret << 4) | ff_interleaved_dirac_golomb_vlc_code[buf];
+            buf = show_bits_long(gb, 32);
+        } while (get_bits_left(gb) > 0);
+
+        return ret - 1;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -147,6 +202,7 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb)
         CLOSE_READER(re, gb);
         return ret - 1;
     }
+#endif
 }
 
 /**
@@ -184,6 +240,28 @@ static inline int get_se_golomb(GetBitContext *gb)
 {
     unsigned int buf;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    if (buf >= (1 << 27)) {
+        buf >>= 32 - 9;
+        skip_bits_long(gb, ff_golomb_vlc_len[buf]);
+
+        return ff_se_golomb_vlc_code[buf];
+    } else {
+        int log = 2 * av_log2(buf) - 31;
+        buf >>= log;
+
+        skip_bits_long(gb, 32 - log);
+
+        if (buf & 1)
+            buf = -(buf >> 1);
+        else
+            buf = (buf >> 1);
+
+        return buf;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -210,6 +288,7 @@ static inline int get_se_golomb(GetBitContext *gb)
 
         return buf;
     }
+#endif
 }
 
 static inline int get_se_golomb_long(GetBitContext *gb)
@@ -223,6 +302,30 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb)
 {
     unsigned int buf;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    if (buf & 0xAA800000) {
+        buf >>= 32 - 8;
+        skip_bits_long(gb, ff_interleaved_golomb_vlc_len[buf]);
+
+        return ff_interleaved_se_golomb_vlc_code[buf];
+    } else {
+        int log;
+        skip_bits(gb, 8);
+        buf |= 1 | show_bits_long(gb, 24);
+
+        if ((buf & 0xAAAAAAAA) == 0)
+            return INVALID_VLC;
+
+        for (log = 31; (buf & 0x80000000) == 0; log--)
+            buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
+
+        skip_bits_long(gb, 63 - 2 * log - 8);
+
+        return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -250,6 +353,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb)
 
         return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
     }
+#endif
 }
 
 static inline int dirac_get_se_golomb(GetBitContext *gb)
@@ -273,6 +377,24 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
     unsigned int buf;
     int log;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    log = av_log2(buf);
+
+    if (log > 31 - limit) {
+        buf >>= log - k;
+        buf  += (30 - log) << k;
+        skip_bits_long(gb, 32 + k - log);
+
+        return buf;
+    } else {
+        skip_bits_long(gb, limit);
+        buf = get_bits_long(gb, esc_len);
+
+        return buf + limit - 1;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -297,6 +419,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit,
 
         return buf + limit - 1;
     }
+#endif
 }
 
 /**
@@ -308,6 +431,35 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
     unsigned int buf;
     int log;
 
+#if CACHED_BITSTREAM_READER
+    buf = show_bits_long(gb, 32);
+
+    log = av_log2(buf);
+
+    if (log - k >= 1 && 32 - log < limit) {
+        buf >>= log - k;
+        buf  += (30 - log) << k;
+        skip_bits_long(gb, 32 + k - log);
+
+        return buf;
+    } else {
+        int i;
+        for (i = 0;
+             i < limit && get_bits1(gb) == 0 && get_bits_left(gb) > 0;
+             i++);
+
+        if (i < limit - 1) {
+            buf = get_bits_long(gb, k);
+
+            return buf + (i << k);
+        } else if (i == limit - 1) {
+            buf = get_bits_long(gb, esc_len);
+
+            return buf + 1;
+        } else
+            return -1;
+    }
+#else
     OPEN_READER(re, gb);
     UPDATE_CACHE(re, gb);
     buf = GET_CACHE(re, gb);
@@ -326,15 +478,19 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
         return buf;
     } else {
         int i;
-        for (i = 0; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) {
+        for (i = 0; i + MIN_CACHE_BITS <= limit && SHOW_UBITS(re, gb, MIN_CACHE_BITS) == 0; i += MIN_CACHE_BITS) {
             if (gb->size_in_bits <= re_index) {
                 CLOSE_READER(re, gb);
                 return -1;
             }
-            LAST_SKIP_BITS(re, gb, 1);
+            LAST_SKIP_BITS(re, gb, MIN_CACHE_BITS);
             UPDATE_CACHE(re, gb);
         }
-        SKIP_BITS(re, gb, 1);
+        for (; i < limit && SHOW_UBITS(re, gb, 1) == 0; i++) {
+            SKIP_BITS(re, gb, 1);
+        }
+        LAST_SKIP_BITS(re, gb, 1);
+        UPDATE_CACHE(re, gb);
 
         if (i < limit - 1) {
             if (k) {
@@ -364,6 +520,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit,
         CLOSE_READER(re, gb);
         return buf;
     }
+#endif
 }
 
 /**

media/ffvpx/libavcodec/h264dsp.h

@@ -45,32 +45,32 @@ typedef struct H264DSPContext {
     h264_biweight_func biweight_h264_pixels_tab[4];
 
     /* loop filter */
-    void (*h264_v_loop_filter_luma)(uint8_t *pix /*align 16*/, int stride,
+    void (*h264_v_loop_filter_luma)(uint8_t *pix /*align 16*/, ptrdiff_t stride,
                                     int alpha, int beta, int8_t *tc0);
-    void (*h264_h_loop_filter_luma)(uint8_t *pix /*align 4 */, int stride,
+    void (*h264_h_loop_filter_luma)(uint8_t *pix /*align 4 */, ptrdiff_t stride,
                                     int alpha, int beta, int8_t *tc0);
-    void (*h264_h_loop_filter_luma_mbaff)(uint8_t *pix /*align 16*/, int stride,
+    void (*h264_h_loop_filter_luma_mbaff)(uint8_t *pix /*align 16*/, ptrdiff_t stride,
                                           int alpha, int beta, int8_t *tc0);
     /* v/h_loop_filter_luma_intra: align 16 */
-    void (*h264_v_loop_filter_luma_intra)(uint8_t *pix, int stride,
+    void (*h264_v_loop_filter_luma_intra)(uint8_t *pix, ptrdiff_t stride,
                                           int alpha, int beta);
-    void (*h264_h_loop_filter_luma_intra)(uint8_t *pix, int stride,
+    void (*h264_h_loop_filter_luma_intra)(uint8_t *pix, ptrdiff_t stride,
                                           int alpha, int beta);
     void (*h264_h_loop_filter_luma_mbaff_intra)(uint8_t *pix /*align 16*/,
-                                                int stride, int alpha, int beta);
-    void (*h264_v_loop_filter_chroma)(uint8_t *pix /*align 8*/, int stride,
+                                                ptrdiff_t stride, int alpha, int beta);
+    void (*h264_v_loop_filter_chroma)(uint8_t *pix /*align 8*/, ptrdiff_t stride,
                                       int alpha, int beta, int8_t *tc0);
-    void (*h264_h_loop_filter_chroma)(uint8_t *pix /*align 4*/, int stride,
+    void (*h264_h_loop_filter_chroma)(uint8_t *pix /*align 4*/, ptrdiff_t stride,
                                       int alpha, int beta, int8_t *tc0);
     void (*h264_h_loop_filter_chroma_mbaff)(uint8_t *pix /*align 8*/,
-                                            int stride, int alpha, int beta,
+                                            ptrdiff_t stride, int alpha, int beta,
                                             int8_t *tc0);
     void (*h264_v_loop_filter_chroma_intra)(uint8_t *pix /*align 8*/,
-                                            int stride, int alpha, int beta);
+                                            ptrdiff_t stride, int alpha, int beta);
     void (*h264_h_loop_filter_chroma_intra)(uint8_t *pix /*align 8*/,
-                                            int stride, int alpha, int beta);
+                                            ptrdiff_t stride, int alpha, int beta);
     void (*h264_h_loop_filter_chroma_mbaff_intra)(uint8_t *pix /*align 8*/,
-                                                  int stride, int alpha, int beta);
+                                                  ptrdiff_t stride, int alpha, int beta);
     // h264_loop_filter_strength: simd only. the C version is inlined in h264_loopfilter.c
     void (*h264_loop_filter_strength)(int16_t bS[2][4][4], uint8_t nnz[40],
                                       int8_t ref[2][40], int16_t mv[2][40][2],

media/ffvpx/libavcodec/internal.h

@@ -83,7 +83,7 @@
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
 
-#define FF_SANE_NB_CHANNELS 64U
+#define FF_SANE_NB_CHANNELS 256U
 
 #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
 
@@ -218,6 +218,14 @@ typedef struct AVCodecInternal {
 
     /* to prevent infinite loop on errors when draining */
     int nb_draining_errors;
+
+    /* used when avctx flag AV_CODEC_FLAG_DROPCHANGED is set */
+    int changed_frames_dropped;
+    int initial_format;
+    int initial_width, initial_height;
+    int initial_sample_rate;
+    int initial_channels;
+    uint64_t initial_channel_layout;
 } AVCodecInternal;
 
 struct AVCodecDefault {
@@ -404,6 +412,18 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len,
  */
 int64_t ff_guess_coded_bitrate(AVCodecContext *avctx);
 
+/**
+ * Check if a value is in the list. If not, return the default value
+ *
+ * @param ctx                Context for the log msg
+ * @param val_name           Name of the checked value, for log msg
+ * @param array_valid_values Array of valid int, ended with INT_MAX
+ * @param default_value      Value return if checked value is not in the array
+ * @return                   Value or default_value.
+ */
+int ff_int_from_list_or_default(void *ctx, const char * val_name, int val,
+                                const int * array_valid_values, int default_value);
+
 #if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avcodec)
 #    define av_export_avcodec __declspec(dllimport)
 #else

media/ffvpx/libavcodec/moz.build

@@ -54,6 +54,7 @@ SOURCES += [
     'null_bsf.c',
     'options.c',
     'parser.c',
+    'parsers.c',
     'pthread.c',
     'pthread_frame.c',
     'pthread_slice.c',

media/ffvpx/libavcodec/mpegvideo.h

@@ -369,7 +369,7 @@ typedef struct MpegEncContext {
     uint8_t *mb_info_ptr;
     int mb_info_size;
     int ehc_mode;
-    int rc_strategy;
+    int rc_strategy;                ///< deprecated
 
     /* H.263+ specific */
     int umvplus;                    ///< == H.263+ && unrestricted_mv
@@ -455,6 +455,7 @@ typedef struct MpegEncContext {
     /* MPEG-2-specific - I wished not to have to support this mess. */
     int progressive_sequence;
     int mpeg_f_code[2][2];
+    int a53_cc;
 
     // picture structure defines are loaded from mpegutils.h
     int picture_structure;
@@ -509,6 +510,8 @@ typedef struct MpegEncContext {
     int (*decode_mb)(struct MpegEncContext *s, int16_t block[12][64]); // used by some codecs to avoid a switch()
 
     int32_t (*block32)[12][64];
+    int dpcm_direction;          // 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan
+    int16_t (*dpcm_macroblock)[3][256];
 
 #define SLICE_OK         0
 #define SLICE_ERROR     -1
@@ -587,12 +590,6 @@ typedef struct MpegEncContext {
 #define FF_MPV_FLAG_NAQ          0x0010
 #define FF_MPV_FLAG_MV0          0x0020
 
-enum rc_strategy {
-    MPV_RC_STRATEGY_FFMPEG,
-    MPV_RC_STRATEGY_XVID,
-    NB_MPV_RC_STRATEGY
-};
-
 #define FF_MPV_OPT_CMP_FUNC \
 { "sad",    "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
 { "sse",    "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \
@@ -646,9 +643,9 @@ FF_MPV_OPT_CMP_FUNC, \
 {"lmax", "maximum Lagrange factor (VBR)",                           FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS },            \
 {"ibias", "intra quant bias",                                       FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS },   \
 {"pbias", "inter quant bias",                                       FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS },   \
-{"rc_strategy", "ratecontrol method",                               FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = MPV_RC_STRATEGY_FFMPEG }, 0, NB_MPV_RC_STRATEGY-1, FF_MPV_OPT_FLAGS, "rc_strategy" },   \
-    { "ffmpeg", "default native rate control", 0, AV_OPT_TYPE_CONST, { .i64 = MPV_RC_STRATEGY_FFMPEG }, 0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \
-    { "xvid",   "libxvid (2 pass only)",       0, AV_OPT_TYPE_CONST, { .i64 = MPV_RC_STRATEGY_XVID },   0, 0, FF_MPV_OPT_FLAGS, "rc_strategy" }, \
+{"rc_strategy", "ratecontrol method",                               FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" },   \
+    { "ffmpeg", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \
+    { "xvid",   "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED, "rc_strategy" }, \
 {"motion_est", "motion estimation algorithm",                       FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" },   \
 { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
 { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
@@ -667,6 +664,7 @@ FF_MPV_OPT_CMP_FUNC, \
 {"ps", "RTP payload size in bytes",                             FF_MPV_OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
 {"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
 {"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
+{"a53cc", "Use A53 Closed Captions (if available)", FF_MPV_OFFSET(a53_cc), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FF_MPV_OPT_FLAGS }, \
 
 extern const AVOption ff_mpv_generic_options[];
 

media/ffvpx/libavcodec/options.c

@@ -347,172 +347,3 @@ const AVClass *avcodec_get_subtitle_rect_class(void)
 {
     return &av_subtitle_rect_class;
 }
-
-#ifdef TEST
-static int dummy_init(AVCodecContext *ctx)
-{
-    //TODO: this code should set every possible pointer that could be set by codec and is not an option;
-    ctx->extradata_size = 8;
-    ctx->extradata = av_malloc(ctx->extradata_size);
-    return 0;
-}
-
-static int dummy_close(AVCodecContext *ctx)
-{
-    av_freep(&ctx->extradata);
-    ctx->extradata_size = 0;
-    return 0;
-}
-
-static int dummy_encode(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int *got_packet)
-{
-    return AVERROR(ENOSYS);
-}
-
-typedef struct Dummy12Context {
-    AVClass  *av_class;
-    int      num;
-    char*    str;
-} Dummy12Context;
-
-typedef struct Dummy3Context {
-    void     *fake_av_class;
-    int      num;
-    char*    str;
-} Dummy3Context;
-
-#define OFFSET(x) offsetof(Dummy12Context, x)
-#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-static const AVOption dummy_options[] = {
-    { "str", "set str", OFFSET(str), AV_OPT_TYPE_STRING, { .str = "i'm src default value" }, 0, 0, VE},
-    { "num", "set num", OFFSET(num), AV_OPT_TYPE_INT,    { .i64 = 1500100900 },    0, INT_MAX, VE},
-    { NULL },
-};
-
-static const AVClass dummy_v1_class = {
-    .class_name = "dummy_v1_class",
-    .item_name  = av_default_item_name,
-    .option     = dummy_options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
-static const AVClass dummy_v2_class = {
-    .class_name = "dummy_v2_class",
-    .item_name  = av_default_item_name,
-    .option     = dummy_options,
-    .version    = LIBAVUTIL_VERSION_INT,
-};
-
-/* codec with options */
-static AVCodec dummy_v1_encoder = {
-    .name             = "dummy_v1_codec",
-    .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = AV_CODEC_ID_NONE - 1,
-    .encode2          = dummy_encode,
-    .init             = dummy_init,
-    .close            = dummy_close,
-    .priv_class       = &dummy_v1_class,
-    .priv_data_size   = sizeof(Dummy12Context),
-};
-
-/* codec with options, different class */
-static AVCodec dummy_v2_encoder = {
-    .name             = "dummy_v2_codec",
-    .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = AV_CODEC_ID_NONE - 2,
-    .encode2          = dummy_encode,
-    .init             = dummy_init,
-    .close            = dummy_close,
-    .priv_class       = &dummy_v2_class,
-    .priv_data_size   = sizeof(Dummy12Context),
-};
-
-/* codec with priv data, but no class */
-static AVCodec dummy_v3_encoder = {
-    .name             = "dummy_v3_codec",
-    .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = AV_CODEC_ID_NONE - 3,
-    .encode2          = dummy_encode,
-    .init             = dummy_init,
-    .close            = dummy_close,
-    .priv_data_size   = sizeof(Dummy3Context),
-};
-
-/* codec without priv data */
-static AVCodec dummy_v4_encoder = {
-    .name             = "dummy_v4_codec",
-    .type             = AVMEDIA_TYPE_VIDEO,
-    .id               = AV_CODEC_ID_NONE - 4,
-    .encode2          = dummy_encode,
-    .init             = dummy_init,
-    .close            = dummy_close,
-};
-
-static void test_copy_print_codec(const AVCodecContext *ctx)
-{
-    printf("%-14s: %dx%d prv: %s",
-           ctx->codec ? ctx->codec->name : "NULL",
-           ctx->width, ctx->height,
-           ctx->priv_data ? "set" : "null");
-    if (ctx->codec && ctx->codec->priv_class && ctx->codec->priv_data_size) {
-        int64_t i64;
-        char *str = NULL;
-        av_opt_get_int(ctx->priv_data, "num", 0, &i64);
-        av_opt_get(ctx->priv_data, "str", 0, (uint8_t**)&str);
-        printf(" opts: %"PRId64" %s", i64, str);
-        av_free(str);
-    }
-    printf("\n");
-}
-
-static void test_copy(const AVCodec *c1, const AVCodec *c2)
-{
-    AVCodecContext *ctx1, *ctx2;
-    printf("%s -> %s\nclosed:\n", c1 ? c1->name : "NULL", c2 ? c2->name : "NULL");
-    ctx1 = avcodec_alloc_context3(c1);
-    ctx2 = avcodec_alloc_context3(c2);
-    ctx1->width = ctx1->height = 128;
-    if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) {
-        av_opt_set(ctx2->priv_data, "num", "667", 0);
-        av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0);
-    }
-    avcodec_copy_context(ctx2, ctx1);
-    test_copy_print_codec(ctx1);
-    test_copy_print_codec(ctx2);
-    if (ctx1->codec) {
-        printf("opened:\n");
-        avcodec_open2(ctx1, ctx1->codec, NULL);
-        if (ctx2->codec && ctx2->codec->priv_class && ctx2->codec->priv_data_size) {
-            av_opt_set(ctx2->priv_data, "num", "667", 0);
-            av_opt_set(ctx2->priv_data, "str", "i'm dest value before copy", 0);
-        }
-        avcodec_copy_context(ctx2, ctx1);
-        test_copy_print_codec(ctx1);
-        test_copy_print_codec(ctx2);
-        avcodec_close(ctx1);
-    }
-    avcodec_free_context(&ctx1);
-    avcodec_free_context(&ctx2);
-}
-
-int main(void)
-{
-    AVCodec *dummy_codec[] = {
-        &dummy_v1_encoder,
-        &dummy_v2_encoder,
-        &dummy_v3_encoder,
-        &dummy_v4_encoder,
-        NULL,
-    };
-    int i, j;
-
-    for (i = 0; dummy_codec[i]; i++)
-        avcodec_register(dummy_codec[i]);
-
-    printf("testing avcodec_copy_context()\n");
-    for (i = 0; i < FF_ARRAY_ELEMS(dummy_codec); i++)
-        for (j = 0; j < FF_ARRAY_ELEMS(dummy_codec); j++)
-            test_copy(dummy_codec[i], dummy_codec[j]);
-    return 0;
-}
-#endif

media/ffvpx/libavcodec/options_table.h

@@ -67,6 +67,8 @@ static const AVOption avcodec_options[] = {
 {"ilme", "interlaced motion estimation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_ME }, INT_MIN, INT_MAX, V|E, "flags"},
 {"cgop", "closed GOP", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_CLOSED_GOP }, INT_MIN, INT_MAX, V|E, "flags"},
 {"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"},
+{"drop_changed", "Drop frames whose parameters differ from first decoded frame", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_DROPCHANGED }, INT_MIN, INT_MAX, A|V|D, "flags"},
+{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"},
 {"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"},
 {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"},
 {"ignorecrop", "ignore cropping information from sps", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"},
@@ -217,34 +219,11 @@ static const AVOption avcodec_options[] = {
 {"buffers", "picture buffer allocations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BUFFERS }, INT_MIN, INT_MAX, V|D, "debug"},
 {"thread_ops", "threading operations", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_THREADS }, INT_MIN, INT_MAX, V|A|D, "debug"},
 {"nomc", "skip motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_NOMC }, INT_MIN, INT_MAX, V|A|D, "debug"},
-{"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"ildctcmp", "interlaced DCT compare function", OFFSET(ildct_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"dia_size", "diamond type & size for motion estimation", OFFSET(dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"last_pred", "amount of motion predictors from the previous frame", OFFSET(last_predictor_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #if FF_API_PRIVATE_OPT
 {"preme", "pre motion estimation", OFFSET(pre_me), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #endif
-{"precmp", "pre motion estimation compare function", OFFSET(me_pre_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"sad", "sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"sse", "sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"satd", "sum of absolute Hadamard transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SATD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"dct", "sum of absolute DCT transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"psnr", "sum of squared quantization errors (avoid, low quality)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_PSNR }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"bit", "number of bits needed for the block", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_BIT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"rd", "rate distortion optimal, slow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_RD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"zero", "0", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_ZERO }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#if CONFIG_SNOW_ENCODER
-{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-#endif
-{"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"},
-{"msad", "sum of absolute differences, median predicted", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_MEDIAN_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E},
 {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
@@ -271,7 +250,6 @@ static const AVOption avcodec_options[] = {
 {"nr", "noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 #endif
 {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
-{"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D, "flags2"},
 {"threads", "set the number of threads", OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|A|E|D, "threads"},
 {"auto", "autodetect a suitable number of threads to use", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
 {"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.i64 = 0 }, -8, 16, V|E},
@@ -310,6 +288,29 @@ static const AVOption avcodec_options[] = {
 {"skip_exp", "frame skip exponent", OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
 {"skipcmp", "frame skip compare function", OFFSET(frame_skip_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 #endif
+{"cmp", "full-pel ME compare function", OFFSET(me_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"subcmp", "sub-pel ME compare function", OFFSET(me_sub_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"mbcmp", "macroblock compare function", OFFSET(mb_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"ildctcmp", "interlaced DCT compare function", OFFSET(ildct_cmp), AV_OPT_TYPE_INT, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"precmp", "pre motion estimation compare function", OFFSET(me_pre_cmp), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"sad", "sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"sse", "sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"satd", "sum of absolute Hadamard transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SATD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"dct", "sum of absolute DCT transformed differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"psnr", "sum of squared quantization errors (avoid, low quality)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_PSNR }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"bit", "number of bits needed for the block", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_BIT }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"rd", "rate distortion optimal, slow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_RD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"zero", "0", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_ZERO }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+#if CONFIG_SNOW_ENCODER
+{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+#endif
+{"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"},
+{"msad", "sum of absolute differences, median predicted", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_MEDIAN_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"mblmin", "minimum macroblock Lagrange factor (VBR)", OFFSET(mb_lmin), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 2 }, 1, FF_LAMBDA_MAX, V|E},
 {"mblmax", "maximum macroblock Lagrange factor (VBR)", OFFSET(mb_lmax), AV_OPT_TYPE_INT, {.i64 = FF_QP2LAMBDA * 31 }, 1, FF_LAMBDA_MAX, V|E},
 #if FF_API_PRIVATE_OPT
@@ -479,6 +480,7 @@ static const AVOption avcodec_options[] = {
 {"allow_high_depth", "allow to output YUV pixel formats with a different chroma sampling than 4:2:0 and/or other than 8 bits per component", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"},
 {"allow_profile_mismatch", "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"},
 {"extra_hw_frames", "Number of extra hardware frames to allocate for the user", OFFSET(extra_hw_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, V|D },
+{"discard_damaged_percentage", "Percentage of damaged samples to discard a frame", OFFSET(discard_damaged_percentage), AV_OPT_TYPE_INT, {.i64 = 95 }, 0, 100, V|D },
 {NULL},
 };
 

media/ffvpx/libavcodec/parser.c

@@ -27,95 +27,10 @@
 #include "libavutil/avassert.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
-#include "libavutil/thread.h"
 
 #include "internal.h"
 #include "parser.h"
 
-/* Parsers */
-extern AVCodecParser ff_aac_parser;
-extern AVCodecParser ff_aac_latm_parser;
-extern AVCodecParser ff_ac3_parser;
-extern AVCodecParser ff_adx_parser;
-extern AVCodecParser ff_bmp_parser;
-extern AVCodecParser ff_cavsvideo_parser;
-extern AVCodecParser ff_cook_parser;
-extern AVCodecParser ff_dca_parser;
-extern AVCodecParser ff_dirac_parser;
-extern AVCodecParser ff_dnxhd_parser;
-extern AVCodecParser ff_dpx_parser;
-extern AVCodecParser ff_dvaudio_parser;
-extern AVCodecParser ff_dvbsub_parser;
-extern AVCodecParser ff_dvdsub_parser;
-extern AVCodecParser ff_dvd_nav_parser;
-extern AVCodecParser ff_flac_parser;
-extern AVCodecParser ff_g729_parser;
-extern AVCodecParser ff_gsm_parser;
-extern AVCodecParser ff_h261_parser;
-extern AVCodecParser ff_h263_parser;
-extern AVCodecParser ff_h264_parser;
-extern AVCodecParser ff_hevc_parser;
-extern AVCodecParser ff_mjpeg_parser;
-extern AVCodecParser ff_mlp_parser;
-extern AVCodecParser ff_mpeg4video_parser;
-extern AVCodecParser ff_mpegaudio_parser;
-extern AVCodecParser ff_mpegvideo_parser;
-extern AVCodecParser ff_opus_parser;
-extern AVCodecParser ff_png_parser;
-extern AVCodecParser ff_pnm_parser;
-extern AVCodecParser ff_rv30_parser;
-extern AVCodecParser ff_rv40_parser;
-extern AVCodecParser ff_sbc_parser;
-extern AVCodecParser ff_sipr_parser;
-extern AVCodecParser ff_tak_parser;
-extern AVCodecParser ff_vc1_parser;
-extern AVCodecParser ff_vorbis_parser;
-extern AVCodecParser ff_vp3_parser;
-extern AVCodecParser ff_vp8_parser;
-extern AVCodecParser ff_vp9_parser;
-extern AVCodecParser ff_xma_parser;
-
-#include "libavcodec/parser_list.c"
-
-static AVOnce av_parser_next_init = AV_ONCE_INIT;
-
-static void av_parser_init_next(void)
-{
-    AVCodecParser *prev = NULL, *p;
-    int i = 0;
-    while ((p = (AVCodecParser*)parser_list[i++])) {
-        if (prev)
-            prev->next = p;
-        prev = p;
-    }
-}
-
-AVCodecParser *av_parser_next(const AVCodecParser *p)
-{
-    ff_thread_once(&av_parser_next_init, av_parser_init_next);
-
-    if (p)
-        return p->next;
-    else
-        return (AVCodecParser*)parser_list[0];
-}
-
-const AVCodecParser *av_parser_iterate(void **opaque)
-{
-    uintptr_t i = (uintptr_t)*opaque;
-    const AVCodecParser *p = parser_list[i];
-
-    if (p)
-        *opaque = (void*)(i + 1);
-
-    return p;
-}
-
-void av_register_codec_parser(AVCodecParser *parser)
-{
-    ff_thread_once(&av_parser_next_init, av_parser_init_next);
-}
-
 AVCodecParserContext *av_parser_init(int codec_id)
 {
     AVCodecParserContext *s = NULL;
@@ -330,6 +245,9 @@ int ff_combine_frame(ParseContext *pc, int next,
     for (; pc->overread > 0; pc->overread--)
         pc->buffer[pc->index++] = pc->buffer[pc->overread_index++];
 
+    if (next > *buf_size)
+        return AVERROR(EINVAL);
+
     /* flush remaining if EOF */
     if (!*buf_size && next == END_NOT_FOUND)
         next = 0;

media/ffvpx/libavcodec/parsers.c

@@ -0,0 +1,110 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+#include "libavutil/thread.h"
+
+#include "avcodec.h"
+
+extern AVCodecParser ff_aac_parser;
+extern AVCodecParser ff_aac_latm_parser;
+extern AVCodecParser ff_ac3_parser;
+extern AVCodecParser ff_adx_parser;
+extern AVCodecParser ff_av1_parser;
+extern AVCodecParser ff_avs2_parser;
+extern AVCodecParser ff_bmp_parser;
+extern AVCodecParser ff_cavsvideo_parser;
+extern AVCodecParser ff_cook_parser;
+extern AVCodecParser ff_dca_parser;
+extern AVCodecParser ff_dirac_parser;
+extern AVCodecParser ff_dnxhd_parser;
+extern AVCodecParser ff_dpx_parser;
+extern AVCodecParser ff_dvaudio_parser;
+extern AVCodecParser ff_dvbsub_parser;
+extern AVCodecParser ff_dvdsub_parser;
+extern AVCodecParser ff_dvd_nav_parser;
+extern AVCodecParser ff_flac_parser;
+extern AVCodecParser ff_g723_1_parser;
+extern AVCodecParser ff_g729_parser;
+extern AVCodecParser ff_gif_parser;
+extern AVCodecParser ff_gsm_parser;
+extern AVCodecParser ff_h261_parser;
+extern AVCodecParser ff_h263_parser;
+extern AVCodecParser ff_h264_parser;
+extern AVCodecParser ff_hevc_parser;
+extern AVCodecParser ff_mjpeg_parser;
+extern AVCodecParser ff_mlp_parser;
+extern AVCodecParser ff_mpeg4video_parser;
+extern AVCodecParser ff_mpegaudio_parser;
+extern AVCodecParser ff_mpegvideo_parser;
+extern AVCodecParser ff_opus_parser;
+extern AVCodecParser ff_png_parser;
+extern AVCodecParser ff_pnm_parser;
+extern AVCodecParser ff_rv30_parser;
+extern AVCodecParser ff_rv40_parser;
+extern AVCodecParser ff_sbc_parser;
+extern AVCodecParser ff_sipr_parser;
+extern AVCodecParser ff_tak_parser;
+extern AVCodecParser ff_vc1_parser;
+extern AVCodecParser ff_vorbis_parser;
+extern AVCodecParser ff_vp3_parser;
+extern AVCodecParser ff_vp8_parser;
+extern AVCodecParser ff_vp9_parser;
+extern AVCodecParser ff_xma_parser;
+
+#include "libavcodec/parser_list.c"
+
+static AVOnce av_parser_next_init = AV_ONCE_INIT;
+
+static void av_parser_init_next(void)
+{
+    AVCodecParser *prev = NULL, *p;
+    int i = 0;
+    while ((p = (AVCodecParser*)parser_list[i++])) {
+        if (prev)
+            prev->next = p;
+        prev = p;
+    }
+}
+
+AVCodecParser *av_parser_next(const AVCodecParser *p)
+{
+    ff_thread_once(&av_parser_next_init, av_parser_init_next);
+
+    if (p)
+        return p->next;
+    else
+        return (AVCodecParser*)parser_list[0];
+}
+
+const AVCodecParser *av_parser_iterate(void **opaque)
+{
+    uintptr_t i = (uintptr_t)*opaque;
+    const AVCodecParser *p = parser_list[i];
+
+    if (p)
+        *opaque = (void*)(i + 1);
+
+    return p;
+}
+
+void av_register_codec_parser(AVCodecParser *parser)
+{
+    ff_thread_once(&av_parser_next_init, av_parser_init_next);
+}

media/ffvpx/libavcodec/profiles.c

@@ -30,7 +30,6 @@ const AVProfile ff_aac_profiles[] = {
     { FF_PROFILE_AAC_LD,    "LD"       },
     { FF_PROFILE_AAC_ELD,   "ELD"      },
     { FF_PROFILE_AAC_MAIN,  "Main" },
-    { FF_PROFILE_AAC_LOW,   "LC"   },
     { FF_PROFILE_AAC_SSR,   "SSR"  },
     { FF_PROFILE_AAC_LTP,   "LTP"  },
     { FF_PROFILE_UNKNOWN },
@@ -152,4 +151,29 @@ const AVProfile ff_sbc_profiles[] = {
     { FF_PROFILE_UNKNOWN },
 };
 
+const AVProfile ff_prores_profiles[] = {
+    { FF_PROFILE_PRORES_PROXY,    "Proxy"    },
+    { FF_PROFILE_PRORES_LT,       "LT"       },
+    { FF_PROFILE_PRORES_STANDARD, "Standard" },
+    { FF_PROFILE_PRORES_HQ,       "HQ"       },
+    { FF_PROFILE_PRORES_4444,     "4444"     },
+    { FF_PROFILE_PRORES_XQ,       "XQ"       },
+    { FF_PROFILE_UNKNOWN }
+};
+
+const AVProfile ff_mjpeg_profiles[] = {
+    { FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT,            "Baseline"    },
+    { FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT, "Sequential"  },
+    { FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT,         "Progressive" },
+    { FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS,                "Lossless"    },
+    { FF_PROFILE_MJPEG_JPEG_LS,                         "JPEG LS"     },
+    { FF_PROFILE_UNKNOWN }
+};
+
+const AVProfile ff_arib_caption_profiles[] = {
+    { FF_PROFILE_ARIB_PROFILE_A, "Profile A" },
+    { FF_PROFILE_ARIB_PROFILE_C, "Profile C" },
+    { FF_PROFILE_UNKNOWN }
+};
+
 #endif /* !CONFIG_SMALL */

media/ffvpx/libavcodec/profiles.h

@@ -33,5 +33,8 @@ extern const AVProfile ff_vc1_profiles[];
 extern const AVProfile ff_vp9_profiles[];
 extern const AVProfile ff_av1_profiles[];
 extern const AVProfile ff_sbc_profiles[];
+extern const AVProfile ff_prores_profiles[];
+extern const AVProfile ff_mjpeg_profiles[];
+extern const AVProfile ff_arib_caption_profiles[];
 
 #endif /* AVCODEC_PROFILES_H */

media/ffvpx/libavcodec/pthread_frame.c

@@ -908,8 +908,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
     }
 
     pthread_mutex_lock(&p->parent->buffer_mutex);
-    if (avctx->thread_safe_callbacks ||
-        avctx->get_buffer2 == avcodec_default_get_buffer2) {
+    if (THREAD_SAFE_CALLBACKS(avctx)) {
         err = ff_get_buffer(avctx, f->f, flags);
     } else {
         pthread_mutex_lock(&p->progress_mutex);
@@ -976,8 +975,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
     FrameThreadContext *fctx;
     AVFrame *dst, *tmp;
     int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) ||
-                          avctx->thread_safe_callbacks                   ||
-                          avctx->get_buffer2 == avcodec_default_get_buffer2;
+                          THREAD_SAFE_CALLBACKS(avctx);
 
     if (!f->f || !f->f->buf[0])
         return;

media/ffvpx/libavcodec/raw.c

@@ -125,6 +125,8 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { AV_PIX_FMT_GRAY10BE,    MKTAG(10 ,  0 , '1', 'Y') },
     { AV_PIX_FMT_GRAY12LE,    MKTAG('Y', '1',  0 , 12 ) },
     { AV_PIX_FMT_GRAY12BE,    MKTAG(12 ,  0 , '1', 'Y') },
+    { AV_PIX_FMT_GRAY14LE,    MKTAG('Y', '1',  0 , 14 ) },
+    { AV_PIX_FMT_GRAY14BE,    MKTAG(14 ,  0 , '1', 'Y') },
     { AV_PIX_FMT_GRAY16LE,    MKTAG('Y', '1',  0 , 16 ) },
     { AV_PIX_FMT_GRAY16BE,    MKTAG(16 ,  0 , '1', 'Y') },
     { AV_PIX_FMT_YUV420P9LE,  MKTAG('Y', '3', 11 ,  9 ) },
@@ -175,6 +177,10 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { AV_PIX_FMT_YUVA422P10BE, MKTAG(10 , 10 , '4', 'Y') },
     { AV_PIX_FMT_YUVA444P10LE, MKTAG('Y', '4',  0 , 10 ) },
     { AV_PIX_FMT_YUVA444P10BE, MKTAG(10 ,  0 , '4', 'Y') },
+    { AV_PIX_FMT_YUVA422P12LE, MKTAG('Y', '4', 10 , 12 ) },
+    { AV_PIX_FMT_YUVA422P12BE, MKTAG(12 , 10 , '4', 'Y') },
+    { AV_PIX_FMT_YUVA444P12LE, MKTAG('Y', '4',  0 , 12 ) },
+    { AV_PIX_FMT_YUVA444P12BE, MKTAG(12 ,  0 , '4', 'Y') },
     { AV_PIX_FMT_YUVA420P16LE, MKTAG('Y', '4', 11 , 16 ) },
     { AV_PIX_FMT_YUVA420P16BE, MKTAG(16 , 11 , '4', 'Y') },
     { AV_PIX_FMT_YUVA422P16LE, MKTAG('Y', '4', 10 , 16 ) },

media/ffvpx/libavcodec/unary.h

@@ -28,7 +28,20 @@
  * @param gb GetBitContext
  * @param[in] stop The bitstop value (unary code of 1's or 0's)
  * @param[in] len Maximum length
- * @return Unary length/index
+ * @return unary 0 based code index. This is also the length in bits of the
+ * code excluding the stop bit.
+ * (in case len=1)
+ * 1            0
+ * 0            1
+ * (in case len=2)
+ * 1            0
+ * 01           1
+ * 00           2
+ * (in case len=3)
+ * 1            0
+ * 01           1
+ * 001          2
+ * 000          3
  */
 static inline int get_unary(GetBitContext *gb, int stop, int len)
 {

media/ffvpx/libavcodec/utils.c

@@ -214,6 +214,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
     case AV_PIX_FMT_YUVA422P9BE:
     case AV_PIX_FMT_YUVA422P10LE:
     case AV_PIX_FMT_YUVA422P10BE:
+    case AV_PIX_FMT_YUVA422P12LE:
+    case AV_PIX_FMT_YUVA422P12BE:
     case AV_PIX_FMT_YUVA422P16LE:
     case AV_PIX_FMT_YUVA422P16BE:
     case AV_PIX_FMT_YUV440P10LE:
@@ -234,6 +236,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
     case AV_PIX_FMT_YUVA444P9BE:
     case AV_PIX_FMT_YUVA444P10LE:
     case AV_PIX_FMT_YUVA444P10BE:
+    case AV_PIX_FMT_YUVA444P12LE:
+    case AV_PIX_FMT_YUVA444P12BE:
     case AV_PIX_FMT_YUVA444P16LE:
     case AV_PIX_FMT_YUVA444P16BE:
     case AV_PIX_FMT_GBRP9LE:
@@ -408,7 +412,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
 void ff_color_frame(AVFrame *frame, const int c[4])
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
-    int p, y, x;
+    int p, y;
 
     av_assert0(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
 
@@ -417,13 +421,19 @@ void ff_color_frame(AVFrame *frame, const int c[4])
         int is_chroma = p == 1 || p == 2;
         int bytes  = is_chroma ? AV_CEIL_RSHIFT(frame->width,  desc->log2_chroma_w) : frame->width;
         int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height;
-        for (y = 0; y < height; y++) {
-            if (desc->comp[0].depth >= 9) {
-                for (x = 0; x<bytes; x++)
-                    ((uint16_t*)dst)[x] = c[p];
-            }else
-                memset(dst, c[p], bytes);
+        if (desc->comp[0].depth >= 9) {
+            ((uint16_t*)dst)[0] = c[p];
+            av_memcpy_backptr(dst + 2, 2, bytes - 2);
             dst += frame->linesize[p];
+            for (y = 1; y < height; y++) {
+                memcpy(dst, frame->data[p], 2*bytes);
+                dst += frame->linesize[p];
+            }
+        } else {
+            for (y = 0; y < height; y++) {
+                memset(dst, c[p], bytes);
+                dst += frame->linesize[p];
+            }
         }
     }
 }
@@ -538,6 +548,7 @@ int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AV
 int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
 {
     int ret = 0;
+    int codec_init_ok = 0;
     AVDictionary *tmp = NULL;
     const AVPixFmtDescriptor *pixdesc;
 
@@ -673,7 +684,18 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
     if (av_codec_is_decoder(codec))
         av_freep(&avctx->subtitle_header);
 
-    if (avctx->channels > FF_SANE_NB_CHANNELS) {
+    if (avctx->channels > FF_SANE_NB_CHANNELS || avctx->channels < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Too many or invalid channels: %d\n", avctx->channels);
+        ret = AVERROR(EINVAL);
+        goto free_and_end;
+    }
+    if (avctx->sample_rate < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate);
+        ret = AVERROR(EINVAL);
+        goto free_and_end;
+    }
+    if (avctx->block_align < 0) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid block align: %d\n", avctx->block_align);
         ret = AVERROR(EINVAL);
         goto free_and_end;
     }
@@ -726,6 +748,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
             goto free_and_end;
     }
 
+    if (av_codec_is_decoder(avctx->codec)) {
+        ret = ff_decode_bsfs_init(avctx);
+        if (ret < 0)
+            goto free_and_end;
+    }
+
     if (HAVE_THREADS
         && !(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) {
         ret = ff_thread_init(avctx);
@@ -924,6 +952,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         if (ret < 0) {
             goto free_and_end;
         }
+        codec_init_ok = 1;
     }
 
     ret=0;
@@ -951,6 +980,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
             ret = AVERROR(EINVAL);
             goto free_and_end;
         }
+        if (avctx->bits_per_coded_sample < 0) {
+            ret = AVERROR(EINVAL);
+            goto free_and_end;
+        }
         if (avctx->sub_charenc) {
             if (avctx->codec_type != AVMEDIA_TYPE_SUBTITLE) {
                 av_log(avctx, AV_LOG_ERROR, "Character encoding is only "
@@ -1007,10 +1040,14 @@ end:
 
     return ret;
 free_and_end:
-    if (avctx->codec &&
-        (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))
+    if (avctx->codec && avctx->codec->close &&
+        (codec_init_ok ||
+         (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)))
         avctx->codec->close(avctx);
 
+    if (HAVE_THREADS && avctx->internal->thread_ctx)
+        ff_thread_free(avctx);
+
     if (codec->priv_class && codec->priv_data_size)
         av_opt_free(avctx->priv_data);
     av_opt_free(avctx);
@@ -1023,6 +1060,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     av_dict_free(&tmp);
     av_freep(&avctx->priv_data);
+    av_freep(&avctx->subtitle_header);
     if (avctx->internal) {
         av_frame_free(&avctx->internal->to_free);
         av_frame_free(&avctx->internal->compat_decode_frame);
@@ -1031,6 +1069,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         av_packet_free(&avctx->internal->last_pkt_props);
 
         av_packet_free(&avctx->internal->ds.in_pkt);
+        ff_decode_bsfs_uninit(avctx);
 
         av_freep(&avctx->internal->pool);
     }
@@ -1389,10 +1428,8 @@ const char *avcodec_profile_name(enum AVCodecID codec_id, int profile)
 
 unsigned avcodec_version(void)
 {
-//    av_assert0(AV_CODEC_ID_V410==164);
     av_assert0(AV_CODEC_ID_PCM_S8_PLANAR==65563);
     av_assert0(AV_CODEC_ID_ADPCM_G722==69660);
-//     av_assert0(AV_CODEC_ID_BMV_AUDIO==86071);
     av_assert0(AV_CODEC_ID_SRT==94216);
     av_assert0(LIBAVCODEC_VERSION_MICRO >= 100);
 
@@ -1430,6 +1467,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
     case AV_CODEC_ID_DSD_MSBF_PLANAR:
     case AV_CODEC_ID_PCM_ALAW:
     case AV_CODEC_ID_PCM_MULAW:
+    case AV_CODEC_ID_PCM_VIDC:
     case AV_CODEC_ID_PCM_S8:
     case AV_CODEC_ID_PCM_S8_PLANAR:
     case AV_CODEC_ID_PCM_U8:
@@ -1536,6 +1574,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
     case AV_CODEC_ID_GSM_MS:       return  320;
     case AV_CODEC_ID_MP1:          return  384;
     case AV_CODEC_ID_ATRAC1:       return  512;
+    case AV_CODEC_ID_ATRAC9:
     case AV_CODEC_ID_ATRAC3:       return 1024 * framecount;
     case AV_CODEC_ID_ATRAC3P:      return 2048;
     case AV_CODEC_ID_MP2:
@@ -1585,8 +1624,6 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
             return 256 * (frame_bytes / 64);
         if (id == AV_CODEC_ID_RA_144)
             return 160 * (frame_bytes / 20);
-        if (id == AV_CODEC_ID_G723_1)
-            return 240 * (frame_bytes / 24);
 
         if (bps > 0) {
             /* calc from frame_bytes and bits_per_coded_sample */
@@ -2195,3 +2232,22 @@ int64_t ff_guess_coded_bitrate(AVCodecContext *avctx)
 
     return bitrate;
 }
+
+int ff_int_from_list_or_default(void *ctx, const char * val_name, int val,
+                                const int * array_valid_values, int default_value)
+{
+    int i = 0, ref_val;
+
+    while (1) {
+        ref_val = array_valid_values[i];
+        if (ref_val == INT_MAX)
+            break;
+        if (val == ref_val)
+            return val;
+        i++;
+    }
+    /* val is not a valid value */
+    av_log(ctx, AV_LOG_DEBUG,
+           "%s %d are not supported. Set to default value : %d\n", val_name, val, default_value);
+    return default_value;
+}

media/ffvpx/libavcodec/version.h

@@ -28,7 +28,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  18
+#define LIBAVCODEC_VERSION_MINOR  54
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -132,6 +132,9 @@
 #ifndef FF_API_NEXT
 #define FF_API_NEXT              (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif
+#ifndef FF_API_UNSANITIZED_BITRATES
+#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59)
+#endif
 
 
 #endif /* AVCODEC_VERSION_H */

media/ffvpx/libavcodec/videodsp_template.c

@@ -44,7 +44,8 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
         src_y = 1 - block_h;
     }
     if (src_x >= w) {
-        src  += (w - 1 - src_x) * sizeof(pixel);
+        // The subtracted expression has an unsigned type and must thus not be negative
+        src  -= (1 + src_x - w) * sizeof(pixel);
         src_x = w - 1;
     } else if (src_x <= -block_w) {
         src  += (1 - block_w - src_x) * sizeof(pixel);

media/ffvpx/libavcodec/vp3dsp.h

@@ -45,9 +45,18 @@ typedef struct VP3DSPContext {
     void (*h_loop_filter)(uint8_t *src, ptrdiff_t stride, int *bounding_values);
 } VP3DSPContext;
 
+void ff_vp3dsp_v_loop_filter_12(uint8_t *first_pixel, ptrdiff_t stride, int *bounding_values);
+void ff_vp3dsp_h_loop_filter_12(uint8_t *first_pixel, ptrdiff_t stride, int *bounding_values);
+
+void ff_vp3dsp_idct10_put(uint8_t *dest, ptrdiff_t stride, int16_t *block);
+void ff_vp3dsp_idct10_add(uint8_t *dest, ptrdiff_t stride, int16_t *block);
+
 void ff_vp3dsp_init(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_arm(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags);
 void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags);
+void ff_vp3dsp_init_mips(VP3DSPContext *c, int flags);
+
+void ff_vp3dsp_set_bounding_values(int * bound_values_array, int filter_limit);
 
 #endif /* AVCODEC_VP3DSP_H */

media/ffvpx/libavcodec/vp56.h

@@ -89,6 +89,7 @@ typedef struct VP56RangeCoder {
     const uint8_t *buffer;
     const uint8_t *end;
     unsigned int code_word;
+    int end_reached;
 } VP56RangeCoder;
 
 typedef struct VP56RefDc {
@@ -105,6 +106,7 @@ typedef struct VP56Macroblock {
 typedef struct VP56Model {
     uint8_t coeff_reorder[64];       /* used in vp6 only */
     uint8_t coeff_index_to_pos[64];  /* used in vp6 only */
+    uint8_t coeff_index_to_idct_selector[64]; /* used in vp6 only */
     uint8_t vector_sig[2];           /* delta sign */
     uint8_t vector_dct[2];           /* delta coding types */
     uint8_t vector_pdi[2][2];        /* predefined delta init */
@@ -157,6 +159,7 @@ struct vp56_context {
     VP56mb mb_type;
     VP56Macroblock *macroblocks;
     DECLARE_ALIGNED(16, int16_t, block_coeff)[6][64];
+    int idct_selector[6];
 
     /* motion vectors */
     VP56mv mv[6];  /* vectors for each block in MB */
@@ -170,6 +173,7 @@ struct vp56_context {
     int filter_mode;
     int max_vector_length;
     int sample_variance_threshold;
+    DECLARE_ALIGNED(8, int, bounding_values_array)[256];
 
     uint8_t coeff_ctx[4][64];              /* used in vp5 only */
     uint8_t coeff_ctx_last[4];             /* used in vp5 only */
@@ -227,6 +231,16 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 extern const uint8_t ff_vp56_norm_shift[256];
 int ff_vp56_init_range_decoder(VP56RangeCoder *c, const uint8_t *buf, int buf_size);
 
+/**
+ * vp5689 returns 1 if the end of the stream has been reached, 0 otherwise.
+ */
+static av_always_inline int vpX_rac_is_end(VP56RangeCoder *c)
+{
+    if (c->end <= c->buffer && c->bits >= 0)
+        c->end_reached ++;
+    return c->end_reached > 10;
+}
+
 static av_always_inline unsigned int vp56_rac_renorm(VP56RangeCoder *c)
 {
     int shift = ff_vp56_norm_shift[c->high];

media/ffvpx/libavcodec/vp56rac.c

@@ -43,6 +43,7 @@ int ff_vp56_init_range_decoder(VP56RangeCoder *c, const uint8_t *buf, int buf_si
     c->bits = -16;
     c->buffer = buf;
     c->end = buf + buf_size;
+    c->end_reached = 0;
     if (buf_size < 1)
         return AVERROR_INVALIDDATA;
     c->code_word = bytestream_get_be24(&c->buffer);

media/ffvpx/libavcodec/vp8.c

@@ -492,9 +492,11 @@ static void fade(uint8_t *dst, ptrdiff_t dst_linesize,
 {
     int i, j;
     for (j = 0; j < height; j++) {
+        const uint8_t *src2 = src + j * src_linesize;
+        uint8_t *dst2 = dst + j * dst_linesize;
         for (i = 0; i < width; i++) {
-            uint8_t y = src[j * src_linesize + i];
-            dst[j * dst_linesize + i] = av_clip_uint8(y + ((y * beta) >> 8) + alpha);
+            uint8_t y = src2[i];
+            dst2[i] = av_clip_uint8(y + ((y * beta) >> 8) + alpha);
         }
     }
 }
@@ -505,6 +507,9 @@ static int vp7_fade_frame(VP8Context *s, VP56RangeCoder *c)
     int beta  = (int8_t) vp8_rac_get_uint(c, 8);
     int ret;
 
+    if (c->end <= c->buffer && c->bits >= 0)
+        return AVERROR_INVALIDDATA;
+
     if (!s->keyframe && (alpha || beta)) {
         int width  = s->mb_width * 16;
         int height = s->mb_height * 16;
@@ -656,7 +661,7 @@ static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si
             s->fade_present = vp8_rac_get(c);
     }
 
-    if (c->end <= c->buffer && c->bits >= 0)
+    if (vpX_rac_is_end(c))
         return AVERROR_INVALIDDATA;
     /* E. Fading information for previous frame */
     if (s->fade_present && vp8_rac_get(c)) {
@@ -2263,7 +2268,7 @@ void filter_mb_simple(VP8Context *s, uint8_t *dst, VP8FilterStrength *f,
 
 #define MARGIN (16 << 2)
 static av_always_inline
-void vp78_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
+int vp78_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
                                     VP8Frame *prev_frame, int is_vp7)
 {
     VP8Context *s = avctx->priv_data;
@@ -2280,6 +2285,10 @@ void vp78_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
 
         s->mv_bounds.mv_min.x = -MARGIN;
         s->mv_bounds.mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
+
+        if (vpX_rac_is_end(&s->c)) {
+            return AVERROR_INVALIDDATA;
+        }
         for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
             if (mb_y == 0)
                 AV_WN32A((mb - s->mb_width - 1)->intra4x4_pred_mode_top,
@@ -2293,18 +2302,19 @@ void vp78_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *curframe,
         s->mv_bounds.mv_min.y -= 64;
         s->mv_bounds.mv_max.y -= 64;
     }
+    return 0;
 }
 
-static void vp7_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
+static int vp7_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
                                    VP8Frame *prev_frame)
 {
-    vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP7);
+    return vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP7);
 }
 
-static void vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
+static int vp8_decode_mv_mb_modes(AVCodecContext *avctx, VP8Frame *cur_frame,
                                    VP8Frame *prev_frame)
 {
-    vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP8);
+    return vp78_decode_mv_mb_modes(avctx, cur_frame, prev_frame, IS_VP8);
 }
 
 #if HAVE_THREADS
@@ -2362,7 +2372,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
         curframe->tf.f->data[2] +  8 * mb_y * s->uvlinesize
     };
 
-    if (c->end <= c->buffer && c->bits >= 0)
+    if (vpX_rac_is_end(c))
          return AVERROR_INVALIDDATA;
 
     if (mb_y == 0)
@@ -2393,7 +2403,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void
     td->mv_bounds.mv_max.x = ((s->mb_width - 1) << 6) + MARGIN;
 
     for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) {
-        if (c->end <= c->buffer && c->bits >= 0)
+        if (vpX_rac_is_end(c))
             return AVERROR_INVALIDDATA;
         // Wait for previous thread to read mb_x+2, and reach mb_y-1.
         if (prev_td != td) {
@@ -2739,9 +2749,11 @@ int vp78_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                 !s->segmentation.update_map)
                 ff_thread_await_progress(&prev_frame->tf, 1, 0);
             if (is_vp7)
-                vp7_decode_mv_mb_modes(avctx, curframe, prev_frame);
+                ret = vp7_decode_mv_mb_modes(avctx, curframe, prev_frame);
             else
-                vp8_decode_mv_mb_modes(avctx, curframe, prev_frame);
+                ret = vp8_decode_mv_mb_modes(avctx, curframe, prev_frame);
+            if (ret < 0)
+                goto err;
         }
 
         if (avctx->active_thread_type == FF_THREAD_FRAME)

media/ffvpx/libavcodec/vp8_parser.c

@@ -70,8 +70,6 @@ static int parse(AVCodecParserContext *s,
         s->coded_height = FFALIGN(height, 16);
     }
 
-    *poutbuf      = buf;
-    *poutbuf_size = buf_size;
     return buf_size;
 }
 

media/ffvpx/libavcodec/vp8dsp.c

@@ -673,6 +673,8 @@ av_cold void ff_vp78dsp_init(VP8DSPContext *dsp)
     VP78_BILINEAR_MC_FUNC(1, 8);
     VP78_BILINEAR_MC_FUNC(2, 4);
 
+    if (ARCH_AARCH64)
+        ff_vp78dsp_init_aarch64(dsp);
     if (ARCH_ARM)
         ff_vp78dsp_init_arm(dsp);
     if (ARCH_PPC)
@@ -733,6 +735,8 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
     dsp->vp8_v_loop_filter_simple = vp8_v_loop_filter_simple_c;
     dsp->vp8_h_loop_filter_simple = vp8_h_loop_filter_simple_c;
 
+    if (ARCH_AARCH64)
+        ff_vp8dsp_init_aarch64(dsp);
     if (ARCH_ARM)
         ff_vp8dsp_init_arm(dsp);
     if (ARCH_X86)

media/ffvpx/libavcodec/vp8dsp.h

@@ -91,11 +91,13 @@ void ff_put_vp8_pixels4_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
 void ff_vp7dsp_init(VP8DSPContext *c);
 
 void ff_vp78dsp_init(VP8DSPContext *c);
+void ff_vp78dsp_init_aarch64(VP8DSPContext *c);
 void ff_vp78dsp_init_arm(VP8DSPContext *c);
 void ff_vp78dsp_init_ppc(VP8DSPContext *c);
 void ff_vp78dsp_init_x86(VP8DSPContext *c);
 
 void ff_vp8dsp_init(VP8DSPContext *c);
+void ff_vp8dsp_init_aarch64(VP8DSPContext *c);
 void ff_vp8dsp_init_arm(VP8DSPContext *c);
 void ff_vp8dsp_init_x86(VP8DSPContext *c);
 void ff_vp8dsp_init_mips(VP8DSPContext *c);

media/ffvpx/libavcodec/vp9.c

@@ -353,7 +353,7 @@ static av_always_inline int inv_recenter_nonneg(int v, int m)
 // differential forward probability updates
 static int update_prob(VP56RangeCoder *c, int p)
 {
-    static const int inv_map_table[255] = {
+    static const uint8_t inv_map_table[255] = {
           7,  20,  33,  46,  59,  72,  85,  98, 111, 124, 137, 150, 163, 176,
         189, 202, 215, 228, 241, 254,   1,   2,   3,   4,   5,   6,   8,   9,
          10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  21,  22,  23,  24,
@@ -1306,6 +1306,9 @@ static int decode_tiles(AVCodecContext *avctx,
                         decode_sb_mem(td, row, col, lflvl_ptr,
                                       yoff2, uvoff2, BL_64X64);
                     } else {
+                        if (vpX_rac_is_end(td->c)) {
+                            return AVERROR_INVALIDDATA;
+                        }
                         decode_sb(td, row, col, lflvl_ptr,
                                   yoff2, uvoff2, BL_64X64);
                     }

media/ffvpx/libavcodec/vp9_parser.c

@@ -36,12 +36,16 @@ static int parse(AVCodecParserContext *ctx,
     *out_data = data;
     *out_size = size;
 
-    if ((res = init_get_bits8(&gb, data, size)) < 0)
+    if (!size || (res = init_get_bits8(&gb, data, size)) < 0)
         return size; // parsers can't return errors
     get_bits(&gb, 2); // frame marker
     profile  = get_bits1(&gb);
     profile |= get_bits1(&gb) << 1;
     if (profile == 3) profile += get_bits1(&gb);
+    if (profile > 3)
+        return size;
+
+    avctx->profile = profile;
 
     if (get_bits1(&gb)) {
         keyframe = 0;

media/ffvpx/libavcodec/vp9_superframe_split_bsf.c

@@ -30,7 +30,7 @@
 #include "get_bits.h"
 
 typedef struct VP9SFSplitContext {
-    AVPacket buffer_pkt;
+    AVPacket *buffer_pkt;
 
     int nb_frames;
     int next_frame;
@@ -43,13 +43,13 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
     VP9SFSplitContext *s = ctx->priv_data;
     AVPacket *in;
     int i, j, ret, marker;
-    int is_superframe = !!s->buffer_pkt.data;
+    int is_superframe = !!s->buffer_pkt->data;
 
-    if (!s->buffer_pkt.data) {
-        ret = ff_bsf_get_packet_ref(ctx, &s->buffer_pkt);
+    if (!s->buffer_pkt->data) {
+        ret = ff_bsf_get_packet_ref(ctx, s->buffer_pkt);
         if (ret < 0)
             return ret;
-        in = &s->buffer_pkt;
+        in = s->buffer_pkt;
 
         marker = in->data[in->size - 1];
         if ((marker & 0xe0) == 0xc0) {
@@ -90,7 +90,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
         GetBitContext gb;
         int profile, invisible = 0;
 
-        ret = av_packet_ref(out, &s->buffer_pkt);
+        ret = av_packet_ref(out, s->buffer_pkt);
         if (ret < 0)
             goto fail;
 
@@ -101,7 +101,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
         s->next_frame++;
 
         if (s->next_frame >= s->nb_frames)
-            av_packet_unref(&s->buffer_pkt);
+            av_packet_unref(s->buffer_pkt);
 
         ret = init_get_bits8(&gb, out->data, out->size);
         if (ret < 0)
@@ -121,26 +121,45 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
             out->pts = AV_NOPTS_VALUE;
 
     } else {
-        av_packet_move_ref(out, &s->buffer_pkt);
+        av_packet_move_ref(out, s->buffer_pkt);
     }
 
     return 0;
 fail:
     if (ret < 0)
         av_packet_unref(out);
-    av_packet_unref(&s->buffer_pkt);
+    av_packet_unref(s->buffer_pkt);
     return ret;
 }
 
+static int vp9_superframe_split_init(AVBSFContext *ctx)
+{
+    VP9SFSplitContext *s = ctx->priv_data;
+
+    s->buffer_pkt = av_packet_alloc();
+    if (!s->buffer_pkt)
+        return AVERROR(ENOMEM);
+
+    return 0;
+}
+
+static void vp9_superframe_split_flush(AVBSFContext *ctx)
+{
+    VP9SFSplitContext *s = ctx->priv_data;
+    av_packet_unref(s->buffer_pkt);
+}
+
 static void vp9_superframe_split_uninit(AVBSFContext *ctx)
 {
     VP9SFSplitContext *s = ctx->priv_data;
-    av_packet_unref(&s->buffer_pkt);
+    av_packet_free(&s->buffer_pkt);
 }
 
 const AVBitStreamFilter ff_vp9_superframe_split_bsf = {
     .name = "vp9_superframe_split",
     .priv_data_size = sizeof(VP9SFSplitContext),
+    .init           = vp9_superframe_split_init,
+    .flush          = vp9_superframe_split_flush,
     .close          = vp9_superframe_split_uninit,
     .filter         = vp9_superframe_split_filter,
     .codec_ids      = (const enum AVCodecID []){ AV_CODEC_ID_VP9, AV_CODEC_ID_NONE },

media/ffvpx/libavutil/arm/asm.S

@@ -46,6 +46,12 @@
 #   define FPU @
 #endif
 
+#if CONFIG_THUMB && defined(__APPLE__)
+#   define TFUNC
+#else
+#   define TFUNC @
+#endif
+
 #if HAVE_AS_ARCH_DIRECTIVE
 #if   HAVE_NEON
         .arch           armv7-a
@@ -98,10 +104,12 @@ FUNC    .endfunc
         .global EXTERN_ASM\name
 ELF     .type   EXTERN_ASM\name, %function
 FUNC    .func   EXTERN_ASM\name
+TFUNC   .thumb_func EXTERN_ASM\name
 EXTERN_ASM\name:
     .else
 ELF     .type   \name, %function
 FUNC    .func   \name
+TFUNC   .thumb_func \name
 \name:
     .endif
 .endm
@@ -117,6 +125,8 @@ ELF     .size   \name, . - \name
 .else
         .section        .rodata
 .endif
+#elif defined(_WIN32)
+        .section        .rdata
 #elif !defined(__MACH__)
         .section        .rodata
 #else

media/ffvpx/libavutil/avassert.h

@@ -66,7 +66,7 @@
 #endif
 
 /**
- * Assert that floating point opperations can be executed.
+ * Assert that floating point operations can be executed.
  *
  * This will av_assert0() that the cpu is not in MMX state on X86
  */

media/ffvpx/libavutil/avstring.c

@@ -222,12 +222,13 @@ int av_strcasecmp(const char *a, const char *b)
 
 int av_strncasecmp(const char *a, const char *b, size_t n)
 {
-    const char *end = a + n;
     uint8_t c1, c2;
+    if (n <= 0)
+        return 0;
     do {
         c1 = av_tolower(*a++);
         c2 = av_tolower(*b++);
-    } while (a < end && c1 && c1 == c2);
+    } while (--n && c1 && c1 == c2);
     return c1 - c2;
 }
 

media/ffvpx/libavutil/avstring.h

@@ -400,6 +400,12 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
  */
 int av_match_list(const char *name, const char *list, char separator);
 
+/**
+ * See libc sscanf manual for more information.
+ * Locale-independent sscanf implementation.
+ */
+int av_sscanf(const char *string, const char *format, ...);
+
 /**
  * @}
  */

media/ffvpx/libavutil/colorspace.h

@@ -107,4 +107,44 @@ static inline int C_JPEG_TO_CCIR(int y) {
 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 -           \
    FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
 
+#define RGB_TO_Y_JPEG(r, g, b) \
+(FFMIN((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \
+  FIX(0.11400) * (b) + (ONE_HALF)) >> SCALEBITS, 255))
+
+#define RGB_TO_U_JPEG(r1, g1, b1)\
+(((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + \
+     FIX(0.50000) * b1 + (ONE_HALF) - 1) >> (SCALEBITS)) + 128)
+
+#define RGB_TO_V_JPEG(r1, g1, b1)\
+(((FIX(0.50000) * r1 - FIX(0.41869) * g1 - \
+   FIX(0.08131) * b1 + (ONE_HALF) - 1) >> (SCALEBITS)) + 128)
+
+// Conversion macros for 8-bit RGB to YUV
+// Derived from ITU-R BT.709-6 (06/2015) Item 3.5
+// https://www.itu.int/rec/R-REC-BT.709-6-201506-I/en
+
+#define RGB_TO_Y_BT709(r, g, b) \
+((FIX(0.21260*219.0/255.0) * (r) + FIX(0.71520*219.0/255.0) * (g) + \
+  FIX(0.07220*219.0/255.0) * (b) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS)
+
+#define RGB_TO_U_BT709(r1, g1, b1, shift)\
+(((- FIX(0.11457*224.0/255.0) * r1 - FIX(0.38543*224.0/255.0) * g1 +         \
+     FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
+
+#define RGB_TO_V_BT709(r1, g1, b1, shift)\
+(((FIX(0.50000*224.0/255.0) * r1 - FIX(0.45415*224.0/255.0) * g1 -           \
+   FIX(0.04585*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
+
+#define RGB_TO_Y_BT709_FULL(r, g, b) \
+(FFMIN((FIX(0.21260) * (r) + FIX(0.71520) * (g) + \
+  FIX(0.07220) * (b) + (ONE_HALF)) >> SCALEBITS, 255))
+
+#define RGB_TO_U_BT709_FULL(r1, g1, b1)\
+(((- FIX(0.11457) * r1 - FIX(0.38543) * g1 + \
+     FIX(0.50000) * b1 + (ONE_HALF) - 1) >> (SCALEBITS)) + 128)
+
+#define RGB_TO_V_BT709_FULL(r1, g1, b1)\
+(((FIX(0.50000) * r1 - FIX(0.45415) * g1 - \
+   FIX(0.04585) * b1 + (ONE_HALF) - 1) >> (SCALEBITS)) + 128)
+
 #endif /* AVUTIL_COLORSPACE_H */

media/ffvpx/libavutil/dynarray.h

@@ -23,7 +23,7 @@
 #include "mem.h"
 
 /**
- * Add an element of to a dynamic array.
+ * Add an element to a dynamic array.
  *
  * The array is reallocated when its number of elements reaches powers of 2.
  * Therefore, the amortized cost of adding an element is constant.

media/ffvpx/libavutil/float_dsp.c

@@ -32,6 +32,14 @@ static void vector_fmul_c(float *dst, const float *src0, const float *src1,
         dst[i] = src0[i] * src1[i];
 }
 
+static void vector_dmul_c(double *dst, const double *src0, const double *src1,
+                          int len)
+{
+    int i;
+    for (i = 0; i < len; i++)
+        dst[i] = src0[i] * src1[i];
+}
+
 static void vector_fmac_scalar_c(float *dst, const float *src, float mul,
                                  int len)
 {
@@ -131,6 +139,7 @@ av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact)
         return NULL;
 
     fdsp->vector_fmul = vector_fmul_c;
+    fdsp->vector_dmul = vector_dmul_c;
     fdsp->vector_fmac_scalar = vector_fmac_scalar_c;
     fdsp->vector_fmul_scalar = vector_fmul_scalar_c;
     fdsp->vector_dmac_scalar = vector_dmac_scalar_c;

media/ffvpx/libavutil/float_dsp.h

@@ -173,6 +173,22 @@ typedef struct AVFloatDSPContext {
      * @return sum of elementwise products
      */
     float (*scalarproduct_float)(const float *v1, const float *v2, int len);
+
+    /**
+     * Calculate the entry wise product of two vectors of doubles and store the result in
+     * a vector of doubles.
+     *
+     * @param dst  output vector
+     *             constraints: 32-byte aligned
+     * @param src0 first input vector
+     *             constraints: 32-byte aligned
+     * @param src1 second input vector
+     *             constraints: 32-byte aligned
+     * @param len  number of elements in the input
+     *             constraints: multiple of 16
+     */
+    void (*vector_dmul)(double *dst, const double *src0, const double *src1,
+                        int len);
 } AVFloatDSPContext;
 
 /**

media/ffvpx/libavutil/frame.c

@@ -211,7 +211,8 @@ void av_frame_free(AVFrame **frame)
 static int get_video_buffer(AVFrame *frame, int align)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
-    int ret, i;
+    int ret, i, padded_height;
+    int plane_padding = FFMAX(16 + 16/*STRIDE_ALIGN*/, align);
 
     if (!desc)
         return AVERROR(EINVAL);
@@ -236,23 +237,24 @@ static int get_video_buffer(AVFrame *frame, int align)
             frame->linesize[i] = FFALIGN(frame->linesize[i], align);
     }
 
-    for (i = 0; i < 4 && frame->linesize[i]; i++) {
-        int h = FFALIGN(frame->height, 32);
-        if (i == 1 || i == 2)
-            h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h);
+    padded_height = FFALIGN(frame->height, 32);
+    if ((ret = av_image_fill_pointers(frame->data, frame->format, padded_height,
+                                      NULL, frame->linesize)) < 0)
+        return ret;
 
-        frame->buf[i] = av_buffer_alloc(frame->linesize[i] * h + 16 + 16/*STRIDE_ALIGN*/ - 1);
-        if (!frame->buf[i])
-            goto fail;
-
-        frame->data[i] = frame->buf[i]->data;
+    frame->buf[0] = av_buffer_alloc(ret + 4*plane_padding);
+    if (!frame->buf[0]) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
     }
-    if (desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL) {
-        av_buffer_unref(&frame->buf[1]);
-        frame->buf[1] = av_buffer_alloc(AVPALETTE_SIZE);
-        if (!frame->buf[1])
-            goto fail;
-        frame->data[1] = frame->buf[1]->data;
+
+    if ((ret = av_image_fill_pointers(frame->data, frame->format, padded_height,
+                                      frame->buf[0]->data, frame->linesize)) < 0)
+        goto fail;
+
+    for (i = 1; i < 4; i++) {
+        if (frame->data[i])
+            frame->data[i] += i * plane_padding;
     }
 
     frame->extended_data = frame->data;
@@ -260,7 +262,7 @@ static int get_video_buffer(AVFrame *frame, int align)
     return 0;
 fail:
     av_frame_unref(frame);
-    return AVERROR(ENOMEM);
+    return ret;
 }
 
 static int get_audio_buffer(AVFrame *frame, int align)
@@ -819,7 +821,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type)
     switch(type) {
     case AV_FRAME_DATA_PANSCAN:         return "AVPanScan";
     case AV_FRAME_DATA_A53_CC:          return "ATSC A53 Part 4 Closed Captions";
-    case AV_FRAME_DATA_STEREO3D:        return "Stereoscopic 3d metadata";
+    case AV_FRAME_DATA_STEREO3D:        return "Stereo 3D";
     case AV_FRAME_DATA_MATRIXENCODING:  return "AVMatrixEncoding";
     case AV_FRAME_DATA_DOWNMIX_INFO:    return "Metadata relevant to a downmix procedure";
     case AV_FRAME_DATA_REPLAYGAIN:      return "AVReplayGain";
@@ -831,9 +833,15 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type)
     case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA:  return "Mastering display metadata";
     case AV_FRAME_DATA_CONTENT_LIGHT_LEVEL:         return "Content light level metadata";
     case AV_FRAME_DATA_GOP_TIMECODE:                return "GOP timecode";
+    case AV_FRAME_DATA_S12M_TIMECODE:               return "SMPTE 12-1 timecode";
+    case AV_FRAME_DATA_SPHERICAL:                   return "Spherical Mapping";
     case AV_FRAME_DATA_ICC_PROFILE:                 return "ICC profile";
+#if FF_API_FRAME_QP
     case AV_FRAME_DATA_QP_TABLE_PROPERTIES:         return "QP table properties";
     case AV_FRAME_DATA_QP_TABLE_DATA:               return "QP table data";
+#endif
+    case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)";
+    case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest";
     }
     return NULL;
 }

media/ffvpx/libavutil/frame.h

@@ -158,6 +158,27 @@ enum AVFrameSideDataType {
      */
     AV_FRAME_DATA_QP_TABLE_DATA,
 #endif
+
+    /**
+     * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4 uint32_t
+     * where the first uint32_t describes how many (1-3) of the other timecodes are used.
+     * The timecode format is described in the av_timecode_get_smpte_from_framenum()
+     * function in libavutil/timecode.c.
+     */
+    AV_FRAME_DATA_S12M_TIMECODE,
+
+    /**
+     * HDR dynamic metadata associated with a video frame. The payload is
+     * an AVDynamicHDRPlus type and contains information for color
+     * volume transform - application 4 of SMPTE 2094-40:2016 standard.
+     */
+    AV_FRAME_DATA_DYNAMIC_HDR_PLUS,
+
+    /**
+     * Regions Of Interest, the data is an array of AVRegionOfInterest type, the number of
+     * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size.
+     */
+    AV_FRAME_DATA_REGIONS_OF_INTEREST,
 };
 
 enum AVActiveFormatDescription {
@@ -185,6 +206,62 @@ typedef struct AVFrameSideData {
     AVBufferRef *buf;
 } AVFrameSideData;
 
+/**
+ * Structure describing a single Region Of Interest.
+ *
+ * When multiple regions are defined in a single side-data block, they
+ * should be ordered from most to least important - some encoders are only
+ * capable of supporting a limited number of distinct regions, so will have
+ * to truncate the list.
+ *
+ * When overlapping regions are defined, the first region containing a given
+ * area of the frame applies.
+ */
+typedef struct AVRegionOfInterest {
+    /**
+     * Must be set to the size of this data structure (that is,
+     * sizeof(AVRegionOfInterest)).
+     */
+    uint32_t self_size;
+    /**
+     * Distance in pixels from the top edge of the frame to the top and
+     * bottom edges and from the left edge of the frame to the left and
+     * right edges of the rectangle defining this region of interest.
+     *
+     * The constraints on a region are encoder dependent, so the region
+     * actually affected may be slightly larger for alignment or other
+     * reasons.
+     */
+    int top;
+    int bottom;
+    int left;
+    int right;
+    /**
+     * Quantisation offset.
+     *
+     * Must be in the range -1 to +1.  A value of zero indicates no quality
+     * change.  A negative value asks for better quality (less quantisation),
+     * while a positive value asks for worse quality (greater quantisation).
+     *
+     * The range is calibrated so that the extreme values indicate the
+     * largest possible offset - if the rest of the frame is encoded with the
+     * worst possible quality, an offset of -1 indicates that this region
+     * should be encoded with the best possible quality anyway.  Intermediate
+     * values are then interpolated in some codec-dependent way.
+     *
+     * For example, in 10-bit H.264 the quantisation parameter varies between
+     * -12 and 51.  A typical qoffset value of -1/10 therefore indicates that
+     * this region should be encoded with a QP around one-tenth of the full
+     * range better than the rest of the frame.  So, if most of the frame
+     * were to be encoded with a QP of around 30, this region would get a QP
+     * of around 24 (an offset of approximately -1/10 * (51 - -12) = -6.3).
+     * An extreme value of -1 would indicate that this region should be
+     * encoded with the best possible quality regardless of the treatment of
+     * the rest of the frame - that is, should be encoded at a QP of -12.
+     */
+    AVRational qoffset;
+} AVRegionOfInterest;
+
 /**
  * This structure describes decoded (raw) audio or video data.
  *
@@ -381,7 +458,6 @@ typedef struct AVFrame {
      * that time,
      * the decoder reorders values as needed and sets AVFrame.reordered_opaque
      * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
      */
     int64_t reordered_opaque;
 
@@ -514,6 +590,8 @@ typedef struct AVFrame {
     int decode_error_flags;
 #define FF_DECODE_ERROR_INVALID_BITSTREAM   1
 #define FF_DECODE_ERROR_MISSING_REFERENCE   2
+#define FF_DECODE_ERROR_CONCEALMENT_ACTIVE  4
+#define FF_DECODE_ERROR_DECODE_SLICES       8
 
     /**
      * number of audio channels, only used for audio.

media/ffvpx/libavutil/hwcontext.c

@@ -646,6 +646,9 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
                     ret = AVERROR(ENOMEM);
                     goto fail;
                 }
+                ret = av_hwdevice_ctx_init(dst_ref);
+                if (ret < 0)
+                    goto fail;
                 goto done;
             }
             if (ret != AVERROR(ENOSYS))
@@ -658,10 +661,6 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr,
     goto fail;
 
 done:
-    ret = av_hwdevice_ctx_init(dst_ref);
-    if (ret < 0)
-        goto fail;
-
     *dst_ref_ptr = dst_ref;
     return 0;
 
@@ -871,3 +870,10 @@ fail:
     av_buffer_unref(&dst_ref);
     return ret;
 }
+
+int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src)
+{
+    HWMapDescriptor *hwmap = (HWMapDescriptor*)dst->buf[0]->data;
+    av_frame_unref(hwmap->source);
+    return av_frame_ref(hwmap->source, src);
+}

media/ffvpx/libavutil/hwcontext_internal.h

@@ -156,6 +156,11 @@ int ff_hwframe_map_create(AVBufferRef *hwframe_ref,
                                         HWMapDescriptor *hwmap),
                           void *priv);
 
+/**
+ * Replace the current hwmap of dst with the one from src, used for indirect
+ * mappings like VAAPI->(DRM)->OpenCL/Vulkan where a direct interop is missing
+ */
+int ff_hwframe_map_replace(AVFrame *dst, const AVFrame *src);
 
 extern const HWContextType ff_hwcontext_type_cuda;
 extern const HWContextType ff_hwcontext_type_d3d11va;

media/ffvpx/libavutil/imgutils.c

@@ -311,8 +311,8 @@ static void image_copy_plane(uint8_t       *dst, ptrdiff_t dst_linesize,
 {
     if (!dst || !src)
         return;
-    av_assert0(abs(src_linesize) >= bytewidth);
-    av_assert0(abs(dst_linesize) >= bytewidth);
+    av_assert0(FFABS(src_linesize) >= bytewidth);
+    av_assert0(FFABS(dst_linesize) >= bytewidth);
     for (;height > 0; height--) {
         memcpy(dst, src, bytewidth);
         dst += dst_linesize;
@@ -501,7 +501,6 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
 static void memset_bytes(uint8_t *dst, size_t dst_size, uint8_t *clear,
                          size_t clear_size)
 {
-    size_t pos = 0;
     int same = 1;
     int i;
 
@@ -521,28 +520,12 @@ static void memset_bytes(uint8_t *dst, size_t dst_size, uint8_t *clear,
     if (clear_size == 1) {
         memset(dst, clear[0], dst_size);
         dst_size = 0;
-    } else if (clear_size == 2) {
-        uint16_t val = AV_RN16(clear);
-        for (; dst_size >= 2; dst_size -= 2) {
-            AV_WN16(dst, val);
-            dst += 2;
-        }
-    } else if (clear_size == 4) {
-        uint32_t val = AV_RN32(clear);
-        for (; dst_size >= 4; dst_size -= 4) {
-            AV_WN32(dst, val);
-            dst += 4;
-        }
-    } else if (clear_size == 8) {
-        uint32_t val = AV_RN64(clear);
-        for (; dst_size >= 8; dst_size -= 8) {
-            AV_WN64(dst, val);
-            dst += 8;
-        }
+    } else {
+        if (clear_size > dst_size)
+            clear_size = dst_size;
+        memcpy(dst, clear, clear_size);
+        av_memcpy_backptr(dst + clear_size, clear_size, dst_size - clear_size);
     }
-
-    for (; dst_size; dst_size--)
-        *dst++ = clear[pos++ % clear_size];
 }
 
 // Maximum size in bytes of a plane element (usually a pixel, or multiple pixels

media/ffvpx/libavutil/integer.c

@@ -74,7 +74,7 @@ AVInteger av_mul_i(AVInteger a, AVInteger b){
 
         if(a.v[i])
             for(j=i; j<AV_INTEGER_SIZE && j-i<=nb; j++){
-                carry= (carry>>16) + out.v[j] + a.v[i]*b.v[j-i];
+                carry= (carry>>16) + out.v[j] + a.v[i]*(unsigned)b.v[j-i];
                 out.v[j]= carry;
             }
     }

media/ffvpx/libavutil/internal.h

@@ -52,7 +52,7 @@
 #endif
 
 #ifndef emms_c
-#   define emms_c() while(0)
+#   define emms_c() do {} while(0)
 #endif
 
 #ifndef attribute_align_arg

media/ffvpx/libavutil/intreadwrite.h

@@ -542,6 +542,21 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
 #   define AV_WN64A(p, v) AV_WNA(64, p, v)
 #endif
 
+#if AV_HAVE_BIGENDIAN
+#   define AV_RLA(s, p)    av_bswap##s(AV_RN##s##A(p))
+#   define AV_WLA(s, p, v) AV_WN##s##A(p, av_bswap##s(v))
+#else
+#   define AV_RLA(s, p)    AV_RN##s##A(p)
+#   define AV_WLA(s, p, v) AV_WN##s##A(p, v)
+#endif
+
+#ifndef AV_RL64A
+#   define AV_RL64A(p) AV_RLA(64, p)
+#endif
+#ifndef AV_WL64A
+#   define AV_WL64A(p, v) AV_WLA(64, p, v)
+#endif
+
 /*
  * The AV_COPYxxU macros are suitable for copying data to/from unaligned
  * memory locations.

media/ffvpx/libavutil/log.c

@@ -247,9 +247,9 @@ static void format_line(void *avcl, int level, const char *fmt, va_list vl,
                         AVBPrint part[4], int *print_prefix, int type[2])
 {
     AVClass* avc = avcl ? *(AVClass **) avcl : NULL;
-    av_bprint_init(part+0, 0, 1);
-    av_bprint_init(part+1, 0, 1);
-    av_bprint_init(part+2, 0, 1);
+    av_bprint_init(part+0, 0, AV_BPRINT_SIZE_AUTOMATIC);
+    av_bprint_init(part+1, 0, AV_BPRINT_SIZE_AUTOMATIC);
+    av_bprint_init(part+2, 0, AV_BPRINT_SIZE_AUTOMATIC);
     av_bprint_init(part+3, 0, 65536);
 
     if(type) type[0] = type[1] = AV_CLASS_CATEGORY_NA + 16;

media/ffvpx/libavutil/mem.c

@@ -399,6 +399,18 @@ static void fill32(uint8_t *dst, int len)
 {
     uint32_t v = AV_RN32(dst - 4);
 
+#if HAVE_FAST_64BIT
+    uint64_t v2= v + ((uint64_t)v<<32);
+    while (len >= 32) {
+        AV_WN64(dst   , v2);
+        AV_WN64(dst+ 8, v2);
+        AV_WN64(dst+16, v2);
+        AV_WN64(dst+24, v2);
+        dst += 32;
+        len -= 32;
+    }
+#endif
+
     while (len >= 4) {
         AV_WN32(dst, v);
         dst += 4;

media/ffvpx/libavutil/mem.h

@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
  * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
  *          correctly aligned.
  */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
 
 /**
  * Reallocate the given buffer if it is not large enough, otherwise do nothing.
@@ -363,10 +363,10 @@ av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
  * @endcode
  *
  * @param[in,out] ptr      Already allocated buffer, or `NULL`
- * @param[in,out] size     Pointer to current size of buffer `ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `ptr`
+ * @param[in,out] size     Pointer to the size of buffer `ptr`. `*size` is
+ *                         updated to the new allocated size, in particular 0
+ *                         in case of failure.
+ * @param[in]     min_size Desired minimal size of buffer `ptr`
  * @return `ptr` if the buffer is large enough, a pointer to newly reallocated
  *         buffer if the buffer was not large enough, or `NULL` in case of
  *         error
@@ -397,10 +397,10 @@ void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
  * @param[in,out] ptr      Pointer to pointer to an already allocated buffer.
  *                         `*ptr` will be overwritten with pointer to new
  *                         buffer on success or `NULL` on failure
- * @param[in,out] size     Pointer to current size of buffer `*ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `*ptr`
+ * @param[in,out] size     Pointer to the size of buffer `*ptr`. `*size` is
+ *                         updated to the new allocated size, in particular 0
+ *                         in case of failure.
+ * @param[in]     min_size Desired minimal size of buffer `*ptr`
  * @see av_realloc()
  * @see av_fast_mallocz()
  */
@@ -418,10 +418,10 @@ void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
  * @param[in,out] ptr      Pointer to pointer to an already allocated buffer.
  *                         `*ptr` will be overwritten with pointer to new
  *                         buffer on success or `NULL` on failure
- * @param[in,out] size     Pointer to current size of buffer `*ptr`. `*size` is
- *                         changed to `min_size` in case of success or 0 in
- *                         case of failure
- * @param[in]     min_size New size of buffer `*ptr`
+ * @param[in,out] size     Pointer to the size of buffer `*ptr`. `*size` is
+ *                         updated to the new allocated size, in particular 0
+ *                         in case of failure.
+ * @param[in]     min_size Desired minimal size of buffer `*ptr`
  * @see av_fast_malloc()
  */
 void av_fast_mallocz(void *ptr, unsigned int *size, size_t min_size);

media/ffvpx/libavutil/opt.c

@@ -463,6 +463,9 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
     if (o->flags & AV_OPT_FLAG_READONLY)
         return AVERROR(EINVAL);
 
+    if (o->flags & AV_OPT_FLAG_DEPRECATED)
+        av_log(obj, AV_LOG_WARNING, "The \"%s\" option is deprecated: %s\n", name, o->help);
+
     dst = ((uint8_t *)target_obj) + o->offset;
     switch (o->type) {
     case AV_OPT_TYPE_BOOL:
@@ -493,15 +496,22 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
     case AV_OPT_TYPE_SAMPLE_FMT:
         return set_string_sample_fmt(obj, o, val, dst);
     case AV_OPT_TYPE_DURATION:
-        if (!val) {
-            *(int64_t *)dst = 0;
+        {
+            int64_t usecs = 0;
+            if (val) {
+                if ((ret = av_parse_time(&usecs, val, 1)) < 0) {
+                    av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val);
+                    return ret;
+                }
+            }
+            if (usecs < o->min || usecs > o->max) {
+                av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range [%g - %g]\n",
+                       usecs / 1000000.0, o->name, o->min / 1000000.0, o->max / 1000000.0);
+                return AVERROR(ERANGE);
+            }
+            *(int64_t *)dst = usecs;
             return 0;
-        } else {
-            if ((ret = av_parse_time(dst, val, 1)) < 0)
-                av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val);
-            return ret;
         }
-        break;
     case AV_OPT_TYPE_COLOR:
         return set_string_color(obj, o, val, dst);
     case AV_OPT_TYPE_CHANNEL_LAYOUT:
@@ -759,6 +769,9 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val)
     if (!o || !target_obj || (o->offset<=0 && o->type != AV_OPT_TYPE_CONST))
         return AVERROR_OPTION_NOT_FOUND;
 
+    if (o->flags & AV_OPT_FLAG_DEPRECATED)
+        av_log(obj, AV_LOG_WARNING, "The \"%s\" option is deprecated: %s\n", name, o->help);
+
     dst = (uint8_t *)target_obj + o->offset;
 
     buf[0] = 0;

media/ffvpx/libavutil/opt.h

@@ -289,6 +289,7 @@ typedef struct AVOption {
 #define AV_OPT_FLAG_READONLY        128
 #define AV_OPT_FLAG_BSF_PARAM       (1<<8) ///< a generic parameter which can be set by the user for bit stream filtering
 #define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
+#define AV_OPT_FLAG_DEPRECATED      (1<<17) ///< set if option is deprecated, users should refer to AVOption.help text for more information
 //FIXME think about enc-audio, ... style flags
 
     /**

media/ffvpx/libavutil/parseutils.c

@@ -504,7 +504,7 @@ char *av_small_strptime(const char *p, const char *fmt, struct tm *dt)
         switch(c) {
         case 'H':
         case 'J':
-            val = date_get_num(&p, 0, c == 'H' ? 23 : INT_MAX, 2);
+            val = date_get_num(&p, 0, c == 'H' ? 23 : INT_MAX, c == 'H' ? 2 : 4);
 
             if (val == -1)
                 return NULL;
@@ -661,12 +661,15 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
         if (!q) {
             char *o;
             /* parse timestr as S+ */
-            dt.tm_sec = strtol(p, &o, 10);
+            errno = 0;
+            t = strtoll(p, &o, 10);
             if (o == p) /* the parsing didn't succeed */
                 return AVERROR(EINVAL);
-            dt.tm_min = 0;
-            dt.tm_hour = 0;
+            if (errno == ERANGE)
+                return AVERROR(ERANGE);
             q = o;
+        } else {
+            t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
         }
     }
 
@@ -688,7 +691,6 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
     }
 
     if (duration) {
-        t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec;
         if (q[0] == 'm' && q[1] == 's') {
             suffix = 1000;
             microseconds /= 1000;
@@ -734,7 +736,11 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
     if (*q)
         return AVERROR(EINVAL);
 
+    if (INT64_MAX / suffix < t)
+        return AVERROR(ERANGE);
     t *= suffix;
+    if (INT64_MAX - microseconds < t)
+        return AVERROR(ERANGE);
     t += microseconds;
     *timeval = negative ? -t : t;
     return 0;

media/ffvpx/libavutil/pixdesc.c

@@ -31,19 +31,22 @@
 #include "intreadwrite.h"
 #include "version.h"
 
-void av_read_image_line(uint16_t *dst,
+void av_read_image_line2(void *dst,
                         const uint8_t *data[4], const int linesize[4],
                         const AVPixFmtDescriptor *desc,
                         int x, int y, int c, int w,
-                        int read_pal_component)
+                        int read_pal_component,
+                        int dst_element_size)
 {
     AVComponentDescriptor comp = desc->comp[c];
     int plane = comp.plane;
     int depth = comp.depth;
-    int mask  = (1 << depth) - 1;
+    unsigned mask  = (1ULL << depth) - 1;
     int shift = comp.shift;
     int step  = comp.step;
     int flags = desc->flags;
+    uint16_t *dst16 = dst;
+    uint32_t *dst32 = dst;
 
     if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
         int skip = x * step + comp.offset;
@@ -57,38 +60,56 @@ void av_read_image_line(uint16_t *dst,
             shift -= step;
             p -= shift >> 3;
             shift &= 7;
-            *dst++ = val;
+            if (dst_element_size == 4) *dst32++ = val;
+            else                       *dst16++ = val;
         }
     } else {
         const uint8_t *p = data[plane] + y * linesize[plane] +
                            x * step + comp.offset;
         int is_8bit = shift + depth <= 8;
+        int is_16bit= shift + depth <=16;
 
         if (is_8bit)
             p += !!(flags & AV_PIX_FMT_FLAG_BE);
 
         while (w--) {
-            int val = is_8bit ? *p :
-                flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p);
+            unsigned val;
+            if     (is_8bit)  val = *p;
+            else if(is_16bit) val = flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p);
+            else              val = flags & AV_PIX_FMT_FLAG_BE ? AV_RB32(p) : AV_RL32(p);
             val = (val >> shift) & mask;
             if (read_pal_component)
                 val = data[1][4 * val + c];
             p += step;
-            *dst++ = val;
+            if (dst_element_size == 4) *dst32++ = val;
+            else                       *dst16++ = val;
         }
     }
 }
 
-void av_write_image_line(const uint16_t *src,
+void av_read_image_line(uint16_t *dst,
+                        const uint8_t *data[4], const int linesize[4],
+                        const AVPixFmtDescriptor *desc,
+                        int x, int y, int c, int w,
+                        int read_pal_component)
+{
+    av_read_image_line2(dst, data, linesize, desc,x, y, c, w,
+                        read_pal_component,
+                        2);
+}
+
+void av_write_image_line2(const void *src,
                          uint8_t *data[4], const int linesize[4],
                          const AVPixFmtDescriptor *desc,
-                         int x, int y, int c, int w)
+                         int x, int y, int c, int w, int src_element_size)
 {
     AVComponentDescriptor comp = desc->comp[c];
     int plane = comp.plane;
     int depth = comp.depth;
     int step  = comp.step;
     int flags = desc->flags;
+    const uint32_t *src32 = src;
+    const uint16_t *src16 = src;
 
     if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
         int skip = x * step + comp.offset;
@@ -96,7 +117,7 @@ void av_write_image_line(const uint16_t *src,
         int shift = 8 - depth - (skip & 7);
 
         while (w--) {
-            *p |= *src++ << shift;
+            *p |= (src_element_size == 4 ? *src32++ : *src16++) << shift;
             shift -= step;
             p -= shift >> 3;
             shift &= 7;
@@ -109,17 +130,28 @@ void av_write_image_line(const uint16_t *src,
         if (shift + depth <= 8) {
             p += !!(flags & AV_PIX_FMT_FLAG_BE);
             while (w--) {
-                *p |= (*src++ << shift);
+                *p |= ((src_element_size == 4 ? *src32++ : *src16++) << shift);
                 p += step;
             }
         } else {
             while (w--) {
-                if (flags & AV_PIX_FMT_FLAG_BE) {
-                    uint16_t val = AV_RB16(p) | (*src++ << shift);
-                    AV_WB16(p, val);
+                unsigned s = (src_element_size == 4 ? *src32++ : *src16++);
+                if (shift + depth <= 16) {
+                    if (flags & AV_PIX_FMT_FLAG_BE) {
+                        uint16_t val = AV_RB16(p) | (s << shift);
+                        AV_WB16(p, val);
+                    } else {
+                        uint16_t val = AV_RL16(p) | (s << shift);
+                        AV_WL16(p, val);
+                    }
                 } else {
-                    uint16_t val = AV_RL16(p) | (*src++ << shift);
-                    AV_WL16(p, val);
+                    if (flags & AV_PIX_FMT_FLAG_BE) {
+                        uint32_t val = AV_RB32(p) | (s << shift);
+                        AV_WB32(p, val);
+                    } else {
+                        uint32_t val = AV_RL32(p) | (s << shift);
+                        AV_WL32(p, val);
+                    }
                 }
                 p += step;
             }
@@ -127,6 +159,14 @@ void av_write_image_line(const uint16_t *src,
     }
 }
 
+void av_write_image_line(const uint16_t *src,
+                         uint8_t *data[4], const int linesize[4],
+                         const AVPixFmtDescriptor *desc,
+                         int x, int y, int c, int w)
+{
+    av_write_image_line2(src, data, linesize, desc, x, y, c, w, 2);
+}
+
 #if FF_API_PLUS1_MINUS1
 FF_DISABLE_DEPRECATION_WARNINGS
 #endif
@@ -288,7 +328,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         .comp = {
             { 0, 1, 0, 0, 8, 0, 7, 1 },
         },
-        .flags = AV_PIX_FMT_FLAG_PAL,
+        .flags = AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_ALPHA,
     },
     [AV_PIX_FMT_YUVJ420P] = {
         .name = "yuvj420p",
@@ -611,6 +651,27 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         },
         .alias = "y12le",
     },
+    [AV_PIX_FMT_GRAY14BE] = {
+        .name = "gray14be",
+        .nb_components = 1,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 14, 1, 13, 1 },       /* Y */
+        },
+        .flags = AV_PIX_FMT_FLAG_BE,
+        .alias = "y14be",
+    },
+    [AV_PIX_FMT_GRAY14LE] = {
+        .name = "gray14le",
+        .nb_components = 1,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 14, 1, 13, 1 },       /* Y */
+        },
+        .alias = "y14le",
+    },
     [AV_PIX_FMT_GRAY16BE] = {
         .name = "gray16be",
         .nb_components = 1,
@@ -2185,6 +2246,104 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
         .name  = "opencl",
         .flags = AV_PIX_FMT_FLAG_HWACCEL,
     },
+    [AV_PIX_FMT_GRAYF32BE] = {
+        .name = "grayf32be",
+        .nb_components = 1,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 4, 0, 0, 32, 3, 31, 1 },       /* Y */
+        },
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_FLOAT,
+        .alias = "yf32be",
+    },
+    [AV_PIX_FMT_GRAYF32LE] = {
+        .name = "grayf32le",
+        .nb_components = 1,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 4, 0, 0, 32, 3, 31, 1 },       /* Y */
+        },
+        .flags = AV_PIX_FMT_FLAG_FLOAT,
+        .alias = "yf32le",
+    },
+    [AV_PIX_FMT_YUVA422P12BE] = {
+        .name = "yuva422p12be",
+        .nb_components = 4,
+        .log2_chroma_w = 1,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 12, 1, 11, 1 },        /* Y */
+            { 1, 2, 0, 0, 12, 1, 11, 1 },        /* U */
+            { 2, 2, 0, 0, 12, 1, 11, 1 },        /* V */
+            { 3, 2, 0, 0, 12, 1, 11, 1 },        /* A */
+        },
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
+    },
+    [AV_PIX_FMT_YUVA422P12LE] = {
+        .name = "yuva422p12le",
+        .nb_components = 4,
+        .log2_chroma_w = 1,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 12, 1, 11, 1 },        /* Y */
+            { 1, 2, 0, 0, 12, 1, 11, 1 },        /* U */
+            { 2, 2, 0, 0, 12, 1, 11, 1 },        /* V */
+            { 3, 2, 0, 0, 12, 1, 11, 1 },        /* A */
+        },
+        .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
+    },
+    [AV_PIX_FMT_YUVA444P12BE] = {
+        .name = "yuva444p12be",
+        .nb_components = 4,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 12, 1, 11, 1 },        /* Y */
+            { 1, 2, 0, 0, 12, 1, 11, 1 },        /* U */
+            { 2, 2, 0, 0, 12, 1, 11, 1 },        /* V */
+            { 3, 2, 0, 0, 12, 1, 11, 1 },        /* A */
+        },
+        .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
+    },
+    [AV_PIX_FMT_YUVA444P12LE] = {
+        .name = "yuva444p12le",
+        .nb_components = 4,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 2, 0, 0, 12, 1, 11, 1 },        /* Y */
+            { 1, 2, 0, 0, 12, 1, 11, 1 },        /* U */
+            { 2, 2, 0, 0, 12, 1, 11, 1 },        /* V */
+            { 3, 2, 0, 0, 12, 1, 11, 1 },        /* A */
+        },
+        .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
+    },
+    [AV_PIX_FMT_NV24] = {
+        .name = "nv24",
+        .nb_components = 3,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 1, 0, 0, 8, 0, 7, 1 },        /* Y */
+            { 1, 2, 0, 0, 8, 1, 7, 1 },        /* U */
+            { 1, 2, 1, 0, 8, 1, 7, 2 },        /* V */
+        },
+        .flags = AV_PIX_FMT_FLAG_PLANAR,
+    },
+    [AV_PIX_FMT_NV42] = {
+        .name = "nv42",
+        .nb_components = 3,
+        .log2_chroma_w = 0,
+        .log2_chroma_h = 0,
+        .comp = {
+            { 0, 1, 0, 0, 8, 0, 7, 1 },        /* Y */
+            { 1, 2, 1, 0, 8, 1, 7, 2 },        /* U */
+            { 1, 2, 0, 0, 8, 1, 7, 1 },        /* V */
+        },
+        .flags = AV_PIX_FMT_FLAG_PLANAR,
+    },
 };
 #if FF_API_PLUS1_MINUS1
 FF_ENABLE_DEPRECATION_WARNINGS
@@ -2432,7 +2591,6 @@ void ff_check_pixfmt_descriptors(void){
         av_assert0(d->log2_chroma_h <= 3);
         av_assert0(d->nb_components <= 4);
         av_assert0(d->name && d->name[0]);
-        av_assert0((d->nb_components==4 || d->nb_components==2) == !!(d->flags & AV_PIX_FMT_FLAG_ALPHA));
         av_assert2(av_get_pix_fmt(d->name) == i);
 
         for (j=0; j<FF_ARRAY_ELEMS(d->comp); j++) {
@@ -2483,7 +2641,7 @@ enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt)
 #define FF_COLOR_XYZ      4
 
 #define pixdesc_has_alpha(pixdesc) \
-    ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & AV_PIX_FMT_FLAG_PAL)
+    ((pixdesc)->flags & AV_PIX_FMT_FLAG_ALPHA)
 
 
 static int get_color_type(const AVPixFmtDescriptor *desc) {
@@ -2717,7 +2875,12 @@ int av_color_primaries_from_name(const char *name)
     int i;
 
     for (i = 0; i < FF_ARRAY_ELEMS(color_primaries_names); i++) {
-        size_t len = strlen(color_primaries_names[i]);
+        size_t len;
+
+        if (!color_primaries_names[i])
+            continue;
+
+        len = strlen(color_primaries_names[i]);
         if (!strncmp(color_primaries_names[i], name, len))
             return i;
     }
@@ -2736,7 +2899,12 @@ int av_color_transfer_from_name(const char *name)
     int i;
 
     for (i = 0; i < FF_ARRAY_ELEMS(color_transfer_names); i++) {
-        size_t len = strlen(color_transfer_names[i]);
+        size_t len;
+
+        if (!color_transfer_names[i])
+            continue;
+
+        len = strlen(color_transfer_names[i]);
         if (!strncmp(color_transfer_names[i], name, len))
             return i;
     }
@@ -2755,7 +2923,12 @@ int av_color_space_from_name(const char *name)
     int i;
 
     for (i = 0; i < FF_ARRAY_ELEMS(color_space_names); i++) {
-        size_t len = strlen(color_space_names[i]);
+        size_t len;
+
+        if (!color_space_names[i])
+            continue;
+
+        len = strlen(color_space_names[i]);
         if (!strncmp(color_space_names[i], name, len))
             return i;
     }
@@ -2774,7 +2947,12 @@ int av_chroma_location_from_name(const char *name)
     int i;
 
     for (i = 0; i < FF_ARRAY_ELEMS(chroma_location_names); i++) {
-        size_t len = strlen(chroma_location_names[i]);
+        size_t len;
+
+        if (!chroma_location_names[i])
+            continue;
+
+        len = strlen(chroma_location_names[i]);
         if (!strncmp(chroma_location_names[i], name, len))
             return i;
     }

media/ffvpx/libavutil/pixdesc.h

@@ -167,12 +167,8 @@ typedef struct AVPixFmtDescriptor {
 
 /**
  * The pixel format has an alpha channel. This is set on all formats that
- * support alpha in some way. The exception is AV_PIX_FMT_PAL8, which can
- * carry alpha as part of the palette. Details are explained in the
- * AVPixelFormat enum, and are also encoded in the corresponding
- * AVPixFmtDescriptor.
- *
- * The alpha is always straight, never pre-multiplied.
+ * support alpha in some way, including AV_PIX_FMT_PAL8. The alpha is always
+ * straight, never pre-multiplied.
  *
  * If a codec or a filter does not support alpha, it should set all alpha to
  * opaque, or use the equivalent pixel formats without alpha component, e.g.
@@ -347,7 +343,13 @@ char *av_get_pix_fmt_string(char *buf, int buf_size,
  * format writes the values corresponding to the palette
  * component c in data[1] to dst, rather than the palette indexes in
  * data[0]. The behavior is undefined if the format is not paletted.
+ * @param dst_element_size size of elements in dst array (2 or 4 byte)
  */
+void av_read_image_line2(void *dst, const uint8_t *data[4],
+                        const int linesize[4], const AVPixFmtDescriptor *desc,
+                        int x, int y, int c, int w, int read_pal_component,
+                        int dst_element_size);
+
 void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
                         const int linesize[4], const AVPixFmtDescriptor *desc,
                         int x, int y, int c, int w, int read_pal_component);
@@ -365,7 +367,12 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
  * @param y the vertical coordinate of the first pixel to write
  * @param w the width of the line to write, that is the number of
  * values to write to the image line
+ * @param src_element_size size of elements in src array (2 or 4 byte)
  */
+void av_write_image_line2(const void *src, uint8_t *data[4],
+                         const int linesize[4], const AVPixFmtDescriptor *desc,
+                         int x, int y, int c, int w, int src_element_size);
+
 void av_write_image_line(const uint16_t *src, uint8_t *data[4],
                          const int linesize[4], const AVPixFmtDescriptor *desc,
                          int x, int y, int c, int w);

media/ffvpx/libavutil/pixelutils.c

@@ -51,12 +51,14 @@ DECLARE_BLOCK_FUNCTIONS(2)
 DECLARE_BLOCK_FUNCTIONS(4)
 DECLARE_BLOCK_FUNCTIONS(8)
 DECLARE_BLOCK_FUNCTIONS(16)
+DECLARE_BLOCK_FUNCTIONS(32)
 
 static const av_pixelutils_sad_fn sad_c[] = {
     block_sad_2x2_c,
     block_sad_4x4_c,
     block_sad_8x8_c,
     block_sad_16x16_c,
+    block_sad_32x32_c,
 };
 
 #endif /* CONFIG_PIXELUTILS */

media/ffvpx/libavutil/pixfmt.h

@@ -42,6 +42,10 @@
  * This is stored as BGRA on little-endian CPU architectures and ARGB on
  * big-endian CPUs.
  *
+ * @note
+ * If the resolution is not a multiple of the chroma subsampling factor
+ * then the chroma plane resolution must be rounded up.
+ *
  * @par
  * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
  * image data is stored in AVFrame.data[0]. The palette is transported in
@@ -330,6 +334,20 @@ enum AVPixelFormat {
      */
     AV_PIX_FMT_OPENCL,
 
+    AV_PIX_FMT_GRAY14BE,   ///<        Y        , 14bpp, big-endian
+    AV_PIX_FMT_GRAY14LE,   ///<        Y        , 14bpp, little-endian
+
+    AV_PIX_FMT_GRAYF32BE,  ///< IEEE-754 single precision Y, 32bpp, big-endian
+    AV_PIX_FMT_GRAYF32LE,  ///< IEEE-754 single precision Y, 32bpp, little-endian
+
+    AV_PIX_FMT_YUVA422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, big-endian
+    AV_PIX_FMT_YUVA422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, little-endian
+    AV_PIX_FMT_YUVA444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, big-endian
+    AV_PIX_FMT_YUVA444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, little-endian
+
+    AV_PIX_FMT_NV24,      ///< planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
+    AV_PIX_FMT_NV42,      ///< as above, but U and V bytes are swapped
+
     AV_PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 };
 
@@ -349,6 +367,7 @@ enum AVPixelFormat {
 #define AV_PIX_FMT_GRAY9  AV_PIX_FMT_NE(GRAY9BE,  GRAY9LE)
 #define AV_PIX_FMT_GRAY10 AV_PIX_FMT_NE(GRAY10BE, GRAY10LE)
 #define AV_PIX_FMT_GRAY12 AV_PIX_FMT_NE(GRAY12BE, GRAY12LE)
+#define AV_PIX_FMT_GRAY14 AV_PIX_FMT_NE(GRAY14BE, GRAY14LE)
 #define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
 #define AV_PIX_FMT_YA16   AV_PIX_FMT_NE(YA16BE,   YA16LE)
 #define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
@@ -397,12 +416,16 @@ enum AVPixelFormat {
 #define AV_PIX_FMT_GBRPF32    AV_PIX_FMT_NE(GBRPF32BE,  GBRPF32LE)
 #define AV_PIX_FMT_GBRAPF32   AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
 
+#define AV_PIX_FMT_GRAYF32    AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
+
 #define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
 #define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
 #define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
 #define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
 #define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
+#define AV_PIX_FMT_YUVA422P12 AV_PIX_FMT_NE(YUVA422P12BE, YUVA422P12LE)
+#define AV_PIX_FMT_YUVA444P12 AV_PIX_FMT_NE(YUVA444P12BE, YUVA444P12LE)
 #define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
 #define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
 #define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)

media/ffvpx/libavutil/threadmessage.c

@@ -102,6 +102,19 @@ void av_thread_message_queue_free(AVThreadMessageQueue **mq)
 #endif
 }
 
+int av_thread_message_queue_nb_elems(AVThreadMessageQueue *mq)
+{
+#if HAVE_THREADS
+    int ret;
+    pthread_mutex_lock(&mq->lock);
+    ret = av_fifo_size(mq->fifo);
+    pthread_mutex_unlock(&mq->lock);
+    return ret / mq->elsize;
+#else
+    return AVERROR(ENOSYS);
+#endif
+}
+
 #if HAVE_THREADS
 
 static int av_thread_message_queue_send_locked(AVThreadMessageQueue *mq,

media/ffvpx/libavutil/threadmessage.h

@@ -95,6 +95,14 @@ void av_thread_message_queue_set_err_recv(AVThreadMessageQueue *mq,
 void av_thread_message_queue_set_free_func(AVThreadMessageQueue *mq,
                                            void (*free_func)(void *msg));
 
+/**
+ * Return the current number of messages in the queue.
+ *
+ * @return the current number of messages or AVERROR(ENOSYS) if lavu was built
+ *         without thread support
+ */
+int av_thread_message_queue_nb_elems(AVThreadMessageQueue *mq);
+
 /**
  * Flush the message queue
  *

media/ffvpx/libavutil/time_internal.h

@@ -23,7 +23,7 @@
 #include "config.h"
 
 #if !HAVE_GMTIME_R && !defined(gmtime_r)
-static inline struct tm *gmtime_r(const time_t* clock, struct tm *result)
+static inline struct tm *ff_gmtime_r(const time_t* clock, struct tm *result)
 {
     struct tm *ptr = gmtime(clock);
     if (!ptr)
@@ -31,10 +31,11 @@ static inline struct tm *gmtime_r(const time_t* clock, struct tm *result)
     *result = *ptr;
     return result;
 }
+#define gmtime_r ff_gmtime_r
 #endif
 
 #if !HAVE_LOCALTIME_R && !defined(localtime_r)
-static inline struct tm *localtime_r(const time_t* clock, struct tm *result)
+static inline struct tm *ff_localtime_r(const time_t* clock, struct tm *result)
 {
     struct tm *ptr = localtime(clock);
     if (!ptr)
@@ -42,6 +43,7 @@ static inline struct tm *localtime_r(const time_t* clock, struct tm *result)
     *result = *ptr;
     return result;
 }
+#define localtime_r ff_localtime_r
 #endif
 
 #endif /* AVUTIL_TIME_INTERNAL_H */

media/ffvpx/libavutil/version.h

@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  56
-#define LIBAVUTIL_VERSION_MINOR  14
+#define LIBAVUTIL_VERSION_MINOR  31
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

media/ffvpx/libavutil/x86/cpu.c

@@ -127,7 +127,7 @@ int ff_get_cpu_flags_x86(void)
             rval |= AV_CPU_FLAG_SSE4;
         if (ecx & 0x00100000 )
             rval |= AV_CPU_FLAG_SSE42;
-        if (ecx & 0x01000000 )
+        if (ecx & 0x02000000 )
             rval |= AV_CPU_FLAG_AESNI;
 #if HAVE_AVX
         /* Check OXSAVE and AVX bits */

media/ffvpx/libavutil/x86/float_dsp.asm

@@ -58,6 +58,39 @@ INIT_YMM avx
 VECTOR_FMUL
 %endif
 
+;-----------------------------------------------------------------------------
+; void vector_dmul(double *dst, const double *src0, const double *src1, int len)
+;-----------------------------------------------------------------------------
+%macro VECTOR_DMUL 0
+cglobal vector_dmul, 4,4,4, dst, src0, src1, len
+    lea       lend, [lenq*8 - mmsize*4]
+ALIGN 16
+.loop:
+    movaps    m0,     [src0q + lenq + 0*mmsize]
+    movaps    m1,     [src0q + lenq + 1*mmsize]
+    movaps    m2,     [src0q + lenq + 2*mmsize]
+    movaps    m3,     [src0q + lenq + 3*mmsize]
+    mulpd     m0, m0, [src1q + lenq + 0*mmsize]
+    mulpd     m1, m1, [src1q + lenq + 1*mmsize]
+    mulpd     m2, m2, [src1q + lenq + 2*mmsize]
+    mulpd     m3, m3, [src1q + lenq + 3*mmsize]
+    movaps    [dstq + lenq + 0*mmsize], m0
+    movaps    [dstq + lenq + 1*mmsize], m1
+    movaps    [dstq + lenq + 2*mmsize], m2
+    movaps    [dstq + lenq + 3*mmsize], m3
+
+    sub       lenq, mmsize*4
+    jge       .loop
+    RET
+%endmacro
+
+INIT_XMM sse2
+VECTOR_DMUL
+%if HAVE_AVX_EXTERNAL
+INIT_YMM avx
+VECTOR_DMUL
+%endif
+
 ;------------------------------------------------------------------------------
 ; void ff_vector_fmac_scalar(float *dst, const float *src, float mul, int len)
 ;------------------------------------------------------------------------------

media/ffvpx/libavutil/x86/float_dsp_init.c

@@ -29,6 +29,11 @@ void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1,
 void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1,
                         int len);
 
+void ff_vector_dmul_sse2(double *dst, const double *src0, const double *src1,
+                         int len);
+void ff_vector_dmul_avx(double *dst, const double *src0, const double *src1,
+                        int len);
+
 void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul,
                                int len);
 void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul,
@@ -92,11 +97,13 @@ av_cold void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
         fdsp->butterflies_float   = ff_butterflies_float_sse;
     }
     if (EXTERNAL_SSE2(cpu_flags)) {
+        fdsp->vector_dmul = ff_vector_dmul_sse2;
         fdsp->vector_dmac_scalar = ff_vector_dmac_scalar_sse2;
         fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_sse2;
     }
     if (EXTERNAL_AVX_FAST(cpu_flags)) {
         fdsp->vector_fmul = ff_vector_fmul_avx;
+        fdsp->vector_dmul = ff_vector_dmul_avx;
         fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_avx;
         fdsp->vector_dmul_scalar = ff_vector_dmul_scalar_avx;
         fdsp->vector_dmac_scalar = ff_vector_dmac_scalar_avx;

media/ffvpx/libavutil/x86/pixelutils.asm

@@ -104,8 +104,8 @@ cglobal pixelutils_sad_16x16, 4,4,0, src1, stride1, src2, stride2
     RET
 
 ;-------------------------------------------------------------------------------
-; int ff_pixelutils_sad_16x16_sse(const uint8_t *src1, ptrdiff_t stride1,
-;                                 const uint8_t *src2, ptrdiff_t stride2);
+; int ff_pixelutils_sad_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1,
+;                                  const uint8_t *src2, ptrdiff_t stride2);
 ;-------------------------------------------------------------------------------
 INIT_XMM sse2
 cglobal pixelutils_sad_16x16, 4,4,5, src1, stride1, src2, stride2
@@ -134,8 +134,8 @@ cglobal pixelutils_sad_16x16, 4,4,5, src1, stride1, src2, stride2
     RET
 
 ;-------------------------------------------------------------------------------
-; int ff_pixelutils_sad_[au]_16x16_sse(const uint8_t *src1, ptrdiff_t stride1,
-;                                      const uint8_t *src2, ptrdiff_t stride2);
+; int ff_pixelutils_sad_[au]_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1,
+;                                       const uint8_t *src2, ptrdiff_t stride2);
 ;-------------------------------------------------------------------------------
 %macro SAD_XMM_16x16 1
 INIT_XMM sse2
@@ -163,3 +163,224 @@ cglobal pixelutils_sad_%1_16x16, 4,4,3, src1, stride1, src2, stride2
 
 SAD_XMM_16x16 a
 SAD_XMM_16x16 u
+
+
+%macro PROCESS_SAD_32x4_U 0
+    movu    m1,  [r2]
+    movu    m2,  [r2 + 16]
+    movu    m3,  [r0]
+    movu    m4,  [r0 + 16]
+    psadbw  m1,  m3
+    psadbw  m2,  m4
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    movu    m1,  [r2]
+    movu    m2,  [r2 + 16]
+    movu    m3,  [r0]
+    movu    m4,  [r0 + 16]
+    psadbw  m1,  m3
+    psadbw  m2,  m4
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    movu    m1,  [r2]
+    movu    m2,  [r2 + 16]
+    movu    m3,  [r0]
+    movu    m4,  [r0 + 16]
+    psadbw  m1,  m3
+    psadbw  m2,  m4
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    movu    m1,  [r2]
+    movu    m2,  [r2 + 16]
+    movu    m3,  [r0]
+    movu    m4,  [r0 + 16]
+    psadbw  m1,  m3
+    psadbw  m2,  m4
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+%endmacro
+
+%macro PROCESS_SAD_32x4 1
+    mov%1   m1,  [r2]
+    mov%1   m2,  [r2 + 16]
+    psadbw  m1,  [r0]
+    psadbw  m2,  [r0 + 16]
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    mov%1   m1,  [r2]
+    mov%1   m2,  [r2 + 16]
+    psadbw  m1,  [r0]
+    psadbw  m2,  [r0 + 16]
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    mov%1   m1,  [r2]
+    mov%1   m2,  [r2 + 16]
+    psadbw  m1,  [r0]
+    psadbw  m2,  [r0 + 16]
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+
+    mov%1   m1,  [r2]
+    mov%1   m2,  [r2 + 16]
+    psadbw  m1,  [r0]
+    psadbw  m2,  [r0 + 16]
+    paddd   m1,  m2
+    paddd   m0,  m1
+    lea     r2,  [r2 + r3]
+    lea     r0,  [r0 + r1]
+%endmacro
+
+;-----------------------------------------------------------------------------
+; int ff_pixelutils_sad_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1,
+;                                  const uint8_t *src2, ptrdiff_t stride2);
+;-----------------------------------------------------------------------------
+INIT_XMM sse2
+cglobal pixelutils_sad_32x32, 4,5,5, src1, stride1, src2, stride2
+    pxor  m0,  m0
+    mov   r4d, 4
+.loop:
+    PROCESS_SAD_32x4_U
+    PROCESS_SAD_32x4_U
+    dec r4d
+    jnz .loop
+
+    movhlps m1,  m0
+    paddd   m0,  m1
+    movd    eax, m0
+    RET
+
+;-------------------------------------------------------------------------------
+; int ff_pixelutils_sad_[au]_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1,
+;                                       const uint8_t *src2, ptrdiff_t stride2);
+;-------------------------------------------------------------------------------
+%macro SAD_XMM_32x32 1
+INIT_XMM sse2
+cglobal pixelutils_sad_%1_32x32, 4,5,3, src1, stride1, src2, stride2
+    pxor  m0,  m0
+    mov   r4d, 4
+.loop:
+    PROCESS_SAD_32x4 %1
+    PROCESS_SAD_32x4 %1
+    dec r4d
+    jnz .loop
+
+    movhlps m1,  m0
+    paddd   m0,  m1
+    movd    eax, m0
+    RET
+%endmacro
+
+SAD_XMM_32x32 a
+SAD_XMM_32x32 u
+
+%if HAVE_AVX2_EXTERNAL
+;-------------------------------------------------------------------------------
+; int ff_pixelutils_sad_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1,
+;                                  const uint8_t *src2, ptrdiff_t stride2);
+;-------------------------------------------------------------------------------
+INIT_YMM avx2
+cglobal pixelutils_sad_32x32, 4,7,5, src1, stride1, src2, stride2
+    pxor            m0, m0
+    mov             r4d, 32/4
+    lea             r5, [stride1q * 3]
+    lea             r6, [stride2q * 3]
+
+.loop:
+    movu           m1, [src1q]               ; row 0 of pix0
+    movu           m2, [src2q]               ; row 0 of pix1
+    movu           m3, [src1q + stride1q]    ; row 1 of pix0
+    movu           m4, [src2q + stride2q]    ; row 1 of pix1
+
+    psadbw         m1, m2
+    psadbw         m3, m4
+    paddd          m0, m1
+    paddd          m0, m3
+
+    movu           m1, [src1q + 2 * stride1q] ; row 2 of pix0
+    movu           m2, [src2q + 2 * stride2q] ; row 2 of pix1
+    movu           m3, [src1q + r5]           ; row 3 of pix0
+    movu           m4, [src2q + r6]           ; row 3 of pix1
+
+    psadbw         m1, m2
+    psadbw         m3, m4
+    paddd          m0, m1
+    paddd          m0, m3
+
+    lea            src2q,     [src2q + 4 * stride2q]
+    lea            src1q,     [src1q + 4 * stride1q]
+
+    dec            r4d
+    jnz           .loop
+
+    vextracti128   xm1, m0, 1
+    paddd          xm0, xm1
+    pshufd         xm1, xm0, 2
+    paddd          xm0, xm1
+    movd           eax, xm0
+    RET
+
+;-------------------------------------------------------------------------------
+; int ff_pixelutils_sad_[au]_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1,
+;                                       const uint8_t *src2, ptrdiff_t stride2);
+;-------------------------------------------------------------------------------
+%macro SAD_AVX2_32x32 1
+INIT_YMM avx2
+cglobal pixelutils_sad_%1_32x32, 4,7,3, src1, stride1, src2, stride2
+    pxor           m0, m0
+    mov            r4d, 32/4
+    lea            r5, [stride1q * 3]
+    lea            r6, [stride2q * 3]
+
+.loop:
+    mov%1          m1, [src2q]                ; row 0 of pix1
+    psadbw         m1, [src1q]
+    mov%1          m2, [src2q + stride2q]     ; row 1 of pix1
+    psadbw         m2, [src1q + stride1q]
+
+    paddd          m0, m1
+    paddd          m0, m2
+
+    mov%1          m1, [src2q + 2 * stride2q] ; row 2 of pix1
+    psadbw         m1, [src1q + 2 * stride1q]
+    mov%1          m2, [src2q + r6]           ; row 3 of pix1
+    psadbw         m2, [src1q + r5]
+
+    paddd          m0, m1
+    paddd          m0, m2
+
+    lea            src2q,     [src2q + 4 * stride2q]
+    lea            src1q,     [src1q + 4 * stride1q]
+
+    dec            r4d
+    jnz           .loop
+
+    vextracti128   xm1, m0, 1
+    paddd          xm0, xm1
+    pshufd         xm1, xm0, 2
+    paddd          xm0, xm1
+    movd           eax, xm0
+    RET
+%endmacro
+
+SAD_AVX2_32x32 a
+SAD_AVX2_32x32 u
+%endif

media/ffvpx/libavutil/x86/pixelutils_init.c

@@ -35,6 +35,20 @@ int ff_pixelutils_sad_a_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1,
 int ff_pixelutils_sad_u_16x16_sse2(const uint8_t *src1, ptrdiff_t stride1,
                                    const uint8_t *src2, ptrdiff_t stride2);
 
+int ff_pixelutils_sad_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1,
+                                 const uint8_t *src2, ptrdiff_t stride2);
+int ff_pixelutils_sad_a_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1,
+                                   const uint8_t *src2, ptrdiff_t stride2);
+int ff_pixelutils_sad_u_32x32_sse2(const uint8_t *src1, ptrdiff_t stride1,
+                                   const uint8_t *src2, ptrdiff_t stride2);
+
+int ff_pixelutils_sad_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1,
+                                 const uint8_t *src2, ptrdiff_t stride2);
+int ff_pixelutils_sad_a_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1,
+                                   const uint8_t *src2, ptrdiff_t stride2);
+int ff_pixelutils_sad_u_32x32_avx2(const uint8_t *src1, ptrdiff_t stride1,
+                                   const uint8_t *src2, ptrdiff_t stride2);
+
 void ff_pixelutils_sad_init_x86(av_pixelutils_sad_fn *sad, int aligned)
 {
     int cpu_flags = av_get_cpu_flags();
@@ -61,4 +75,20 @@ void ff_pixelutils_sad_init_x86(av_pixelutils_sad_fn *sad, int aligned)
         case 2: sad[3] = ff_pixelutils_sad_a_16x16_sse2; break; // src1   aligned, src2   aligned
         }
     }
+
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        switch (aligned) {
+        case 0: sad[4] = ff_pixelutils_sad_32x32_sse2;   break; // src1 unaligned, src2 unaligned
+        case 1: sad[4] = ff_pixelutils_sad_u_32x32_sse2; break; // src1   aligned, src2 unaligned
+        case 2: sad[4] = ff_pixelutils_sad_a_32x32_sse2; break; // src1   aligned, src2   aligned
+        }
+    }
+
+    if (EXTERNAL_AVX2_FAST(cpu_flags)) {
+        switch (aligned) {
+        case 0: sad[4] = ff_pixelutils_sad_32x32_avx2;   break; // src1 unaligned, src2 unaligned
+        case 1: sad[4] = ff_pixelutils_sad_u_32x32_avx2; break; // src1   aligned, src2 unaligned
+        case 2: sad[4] = ff_pixelutils_sad_a_32x32_avx2; break; // src1   aligned, src2   aligned
+        }
+    }
 }