From accce3a5c19decfb288c835e0fd4f7909a094563 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 24 May 2020 18:46:28 +1000
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm                  | 10 ++++++++
 SMP/config.h                    | 10 ++++++++
 SMP/libavcodec.vcxproj          | 45 +++++++++++++++++++++++++--------
 SMP/libavcodec.vcxproj.filters  | 15 +++++++++++
 SMP/libavcodec/codec_list.c     |  6 +++++
 SMP/libavcodec/dce_defs.c       |  2 ++
 SMP/libavfilter.def             |  1 -
 SMP/libavfilter.vcxproj         |  3 +++
 SMP/libavfilter.vcxproj.filters |  9 +++++++
 SMP/libavfilter/filter_list.c   |  3 +++
 SMP/libavformat.vcxproj         |  1 -
 SMP/libavformat.vcxproj.filters |  3 ---
 SMP/libavutil.def               |  4 +++
 SMP/libavutil.vcxproj           | 12 +++++++++
 SMP/libavutil.vcxproj.filters   |  6 +++++
 SMP/libswscale/dce_defs.c       | 17 +++++++++++++
 16 files changed, 132 insertions(+), 15 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index e5bdbc8394..13b85785e5 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -536,6 +536,7 @@
 %define CONFIG_LIBXCB_SHAPE 0
 %define CONFIG_LIBXCB_XFIXES 0
 %define CONFIG_LZMA 1
+%define CONFIG_MEDIAFOUNDATION 1
 %define CONFIG_SCHANNEL 0
 %define CONFIG_SDL2 1
 %define CONFIG_SECURETRANSPORT 0
@@ -906,6 +907,7 @@
 %define CONFIG_MVHA_DECODER 1
 %define CONFIG_MWSC_DECODER 1
 %define CONFIG_MXPEG_DECODER 1
+%define CONFIG_NOTCHLC_DECODER 1
 %define CONFIG_NUV_DECODER 1
 %define CONFIG_PAF_VIDEO_DECODER 1
 %define CONFIG_PAM_DECODER 1
@@ -1440,8 +1442,11 @@
 %define CONFIG_WEBVTT_ENCODER 1
 %define CONFIG_XSUB_ENCODER 1
 %define CONFIG_AAC_AT_ENCODER 0
+%define CONFIG_AAC_MF_ENCODER 1
+%define CONFIG_AC3_MF_ENCODER 1
 %define CONFIG_ALAC_AT_ENCODER 0
 %define CONFIG_ILBC_AT_ENCODER 0
+%define CONFIG_MP3_MF_ENCODER 1
 %define CONFIG_PCM_ALAW_AT_ENCODER 0
 %define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBAOM_AV1_ENCODER 0
@@ -1476,6 +1481,7 @@
 %define CONFIG_H263_V4L2M2M_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_AMF_ENCODER 1
+%define CONFIG_H264_MF_ENCODER 1
 %define CONFIG_H264_NVENC_ENCODER 1
 %define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
@@ -1486,6 +1492,7 @@
 %define CONFIG_NVENC_H264_ENCODER 1
 %define CONFIG_NVENC_HEVC_ENCODER 1
 %define CONFIG_HEVC_AMF_ENCODER 1
+%define CONFIG_HEVC_MF_ENCODER 1
 %define CONFIG_HEVC_NVENC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_HEVC_V4L2M2M_ENCODER 0
@@ -1966,6 +1973,7 @@
 %define CONFIG_SCALE_VAAPI_FILTER 0
 %define CONFIG_SCALE_VULKAN_FILTER 0
 %define CONFIG_SCALE2REF_FILTER 1
+%define CONFIG_SCDET_FILTER 1
 %define CONFIG_SCROLL_FILTER 1
 %define CONFIG_SELECT_FILTER 1
 %define CONFIG_SELECTIVECOLOR_FILTER 1
@@ -2022,6 +2030,7 @@
 %define CONFIG_UNPREMULTIPLY_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
 %define CONFIG_UNSHARP_OPENCL_FILTER 0
+%define CONFIG_UNTILE_FILTER 1
 %define CONFIG_USPP_FILTER 1
 %define CONFIG_V360_FILTER 1
 %define CONFIG_VAGUEDENOISER_FILTER 1
@@ -2055,6 +2064,7 @@
 %define CONFIG_COLOR_FILTER 1
 %define CONFIG_COREIMAGESRC_FILTER 0
 %define CONFIG_FREI0R_SRC_FILTER 0
+%define CONFIG_GRADIENTS_FILTER 1
 %define CONFIG_HALDCLUTSRC_FILTER 1
 %define CONFIG_LIFE_FILTER 1
 %define CONFIG_MANDELBROT_FILTER 1
diff --git a/SMP/config.h b/SMP/config.h
index 4835105414..cc0142220d 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -594,6 +594,7 @@
 #define CONFIG_LIBXCB_SHAPE 0
 #define CONFIG_LIBXCB_XFIXES 0
 #define CONFIG_LZMA 1
+#define CONFIG_MEDIAFOUNDATION 1
 #define CONFIG_SCHANNEL 0
 #define CONFIG_SDL2 1
 #define CONFIG_SECURETRANSPORT 0
@@ -976,6 +977,7 @@
 #define CONFIG_MVHA_DECODER 1
 #define CONFIG_MWSC_DECODER 1
 #define CONFIG_MXPEG_DECODER 1
+#define CONFIG_NOTCHLC_DECODER 1
 #define CONFIG_NUV_DECODER 1
 #define CONFIG_PAF_VIDEO_DECODER 1
 #define CONFIG_PAM_DECODER 1
@@ -1510,8 +1512,11 @@
 #define CONFIG_WEBVTT_ENCODER 1
 #define CONFIG_XSUB_ENCODER 1
 #define CONFIG_AAC_AT_ENCODER 0
+#define CONFIG_AAC_MF_ENCODER 1
+#define CONFIG_AC3_MF_ENCODER 1
 #define CONFIG_ALAC_AT_ENCODER 0
 #define CONFIG_ILBC_AT_ENCODER 0
+#define CONFIG_MP3_MF_ENCODER 1
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBAOM_AV1_ENCODER 0
@@ -1546,6 +1551,7 @@
 #define CONFIG_H263_V4L2M2M_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_AMF_ENCODER 1
+#define CONFIG_H264_MF_ENCODER 1
 #define CONFIG_H264_NVENC_ENCODER 1
 #define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
@@ -1556,6 +1562,7 @@
 #define CONFIG_NVENC_H264_ENCODER 1
 #define CONFIG_NVENC_HEVC_ENCODER 1
 #define CONFIG_HEVC_AMF_ENCODER 1
+#define CONFIG_HEVC_MF_ENCODER 1
 #define CONFIG_HEVC_NVENC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_HEVC_V4L2M2M_ENCODER 0
@@ -2088,6 +2095,7 @@
 #define CONFIG_SCALE_VAAPI_FILTER 0
 #define CONFIG_SCALE_VULKAN_FILTER 0
 #define CONFIG_SCALE2REF_FILTER 1
+#define CONFIG_SCDET_FILTER 1
 #define CONFIG_SCROLL_FILTER 1
 #define CONFIG_SELECT_FILTER 1
 #define CONFIG_SELECTIVECOLOR_FILTER 1
@@ -2144,6 +2152,7 @@
 #define CONFIG_UNPREMULTIPLY_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
 #define CONFIG_UNSHARP_OPENCL_FILTER 0
+#define CONFIG_UNTILE_FILTER 1
 #define CONFIG_USPP_FILTER 1
 #define CONFIG_V360_FILTER 1
 #define CONFIG_VAGUEDENOISER_FILTER 1
@@ -2177,6 +2186,7 @@
 #define CONFIG_COLOR_FILTER 1
 #define CONFIG_COREIMAGESRC_FILTER 0
 #define CONFIG_FREI0R_SRC_FILTER 0
+#define CONFIG_GRADIENTS_FILTER 1
 #define CONFIG_HALDCLUTSRC_FILTER 1
 #define CONFIG_LIFE_FILTER 1
 #define CONFIG_MANDELBROT_FILTER 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index 019f531259..2815a43bb6 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -305,6 +305,8 @@
     <ClCompile Include="..\libavcodec\aacenc_ltp.c" />
     <ClCompile Include="..\libavcodec\aacenc_pred.c" />
     <ClCompile Include="..\libavcodec\psymodel.c" />
+    <ClCompile Include="..\libavcodec\mfenc.c" />
+    <ClCompile Include="..\libavcodec\mf_utils.c" />
     <ClCompile Include="..\libavcodec\aasc.c" />
     <ClCompile Include="..\libavcodec\msrledec.c" />
     <ClCompile Include="..\libavcodec\ac3dec_float.c" />
@@ -638,6 +640,7 @@
     <ClCompile Include="..\libavcodec\nellymoserdec.c" />
     <ClCompile Include="..\libavcodec\nellymoser.c" />
     <ClCompile Include="..\libavcodec\nellymoserenc.c" />
+    <ClCompile Include="..\libavcodec\notchlc.c" />
     <ClCompile Include="..\libavcodec\nuv.c" />
     <ClCompile Include="..\libavcodec\rtjpeg.c" />
     <ClCompile Include="..\libavcodec\on2avc.c" />
@@ -1229,8 +1232,10 @@
     <ClInclude Include="..\libavcodec\avcodec.h" />
     <ClInclude Include="..\libavcodec\avdct.h" />
     <ClInclude Include="..\libavcodec\avfft.h" />
+    <ClInclude Include="..\libavcodec\bsf.h" />
     <ClInclude Include="..\libavcodec\codec_desc.h" />
     <ClInclude Include="..\libavcodec\codec_id.h" />
+    <ClInclude Include="..\libavcodec\codec_par.h" />
     <ClInclude Include="..\libavcodec\d3d11va.h" />
     <ClInclude Include="..\libavcodec\dirac.h" />
     <ClInclude Include="..\libavcodec\dv_profile.h" />
@@ -1461,7 +1466,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1473,8 +1478,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -1547,7 +1554,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX64</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libiconvd.lib;liblzmad.lib;libzlibd.lib;libx264d.lib;libx265d.lib;libxvidcored.lib;libilbcd.lib;libmp3lamed.lib;libopusd.lib;libspeexd.lib;libtheorad.lib;libvorbisd.lib;libvpxd.lib;libmfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1559,8 +1566,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -1637,7 +1646,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1652,8 +1661,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -1729,7 +1740,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutild.lib;swresampled.lib;bz2d.lib;iconvd.lib;lzmad.lib;zlibd.lib;x264d.lib;x265d.lib;xvidcored.lib;ilbcd.lib;mp3lamed.lib;opusd.lib;speexd.lib;theorad.lib;vorbisd.lib;vpxd.lib;mfxd.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
@@ -1743,8 +1754,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -1823,7 +1836,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1835,8 +1848,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -1913,7 +1928,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX64</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1925,8 +1940,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -2008,7 +2025,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
@@ -2023,8 +2040,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -2106,7 +2125,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;bz2.lib;iconv.lib;lzma.lib;zlib.lib;x264.lib;x265.lib;xvidcore.lib;ilbc.lib;mp3lame.lib;opus.lib;speex.lib;theora.lib;vorbis.lib;vpx.lib;mfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
       <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
@@ -2120,8 +2139,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -2203,7 +2224,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
@@ -2218,8 +2239,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
@@ -2301,7 +2324,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavcodec.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avutil.lib;swresample.lib;libbz2.lib;libiconv.lib;liblzma.lib;libzlib.lib;libx264.lib;libx265.lib;libxvidcore.lib;libilbc.lib;libmp3lame.lib;libopus.lib;libspeex.lib;libtheora.lib;libvorbis.lib;libvpx.lib;libmfx.lib;mfplat.lib;mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099,4264 %(AdditionalOptions)</AdditionalOptions>
       <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
@@ -2315,8 +2338,10 @@ copy ..\libavcodec\adts_parser.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
+copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\d3d11va.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dirac.h "$(OutDir)"\include\libavcodec
 copy ..\libavcodec\dv_profile.h "$(OutDir)"\include\libavcodec
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index f6d382326b..e5bda55143 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -765,6 +765,12 @@
     <ClCompile Include="..\libavcodec\psymodel.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mfenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\mf_utils.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aasc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -1764,6 +1770,9 @@
     <ClCompile Include="..\libavcodec\nellymoserenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\notchlc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\nuv.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -3209,12 +3218,18 @@
     <ClInclude Include="..\libavcodec\avfft.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\bsf.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\codec_desc.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
     <ClInclude Include="..\libavcodec\codec_id.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavcodec\codec_par.h">
+      <Filter>Header Files\libavcodec</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavcodec\d3d11va.h">
       <Filter>Header Files\libavcodec</Filter>
     </ClInclude>
diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c
index b74fa5a1eb..ebb6f9e731 100644
--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -173,6 +173,9 @@ static const AVCodec *codec_list[] = {
     &ff_text_encoder,
     &ff_webvtt_encoder,
     &ff_xsub_encoder,
+    &ff_aac_mf_encoder,
+    &ff_ac3_mf_encoder,
+    &ff_mp3_mf_encoder,
     &ff_libilbc_encoder,
     &ff_libmp3lame_encoder,
     &ff_libopus_encoder,
@@ -186,12 +189,14 @@ static const AVCodec *codec_list[] = {
     &ff_libx265_encoder,
     &ff_libxvid_encoder,
     &ff_h264_amf_encoder,
+    &ff_h264_mf_encoder,
     &ff_h264_nvenc_encoder,
     &ff_h264_qsv_encoder,
     &ff_nvenc_encoder,
     &ff_nvenc_h264_encoder,
     &ff_nvenc_hevc_encoder,
     &ff_hevc_amf_encoder,
+    &ff_hevc_mf_encoder,
     &ff_hevc_nvenc_encoder,
     &ff_hevc_qsv_encoder,
     &ff_mjpeg_qsv_encoder,
@@ -335,6 +340,7 @@ static const AVCodec *codec_list[] = {
     &ff_mvha_decoder,
     &ff_mwsc_decoder,
     &ff_mxpeg_decoder,
+    &ff_notchlc_decoder,
     &ff_nuv_decoder,
     &ff_paf_video_decoder,
     &ff_pam_decoder,
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index 62ba8cc4fd..9cab28a2d3 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -3491,6 +3491,8 @@ void ff_mpv_common_init_mips(MpegEncContext *s) {return;}
 void ff_mpv_common_init_neon(MpegEncContext *s) {return;}
 void ff_mpv_common_init_ppc(MpegEncContext *s) {return;}
 void ff_opus_dsp_init_aarch64(OpusDSP *ctx) {return;}
+void ff_pixblockdsp_init_aarch64(PixblockDSPContext *c, AVCodecContext *avctx,
+                                 unsigned high_bit_depth) {return;}
 void ff_pixblockdsp_init_alpha(PixblockDSPContext *c, AVCodecContext *avctx,
                                unsigned high_bit_depth) {return;}
 void ff_pixblockdsp_init_arm(PixblockDSPContext *c, AVCodecContext *avctx,
diff --git a/SMP/libavfilter.def b/SMP/libavfilter.def
index 28b92831ef..1ba81aaaf3 100644
--- a/SMP/libavfilter.def
+++ b/SMP/libavfilter.def
@@ -67,4 +67,3 @@ EXPORTS
     avfilter_transform
     avfilter_version
     av_filter_ffversion DATA
-    avfilter_all_channel_layouts DATA
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index 956920f5dc..813b2011e4 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -351,6 +351,7 @@
     <ClCompile Include="..\libavfilter\vf_scale.c" />
     <ClCompile Include="..\libavfilter\scale_eval.c" />
     <ClCompile Include="..\libavfilter\vf_scale_qsv.c" />
+    <ClCompile Include="..\libavfilter\vf_scdet.c" />
     <ClCompile Include="..\libavfilter\vf_scroll.c" />
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c" />
     <ClCompile Include="..\libavfilter\vf_separatefields.c" />
@@ -375,6 +376,7 @@
     <ClCompile Include="..\libavfilter\vf_tonemap.c" />
     <ClCompile Include="..\libavfilter\vf_tpad.c" />
     <ClCompile Include="..\libavfilter\vf_unsharp.c" />
+    <ClCompile Include="..\libavfilter\vf_untile.c" />
     <ClCompile Include="..\libavfilter\vf_uspp.c" />
     <ClCompile Include="..\libavfilter\vf_vaguedenoiser.c" />
     <ClCompile Include="..\libavfilter\vf_vectorscope.c" />
@@ -391,6 +393,7 @@
     <ClCompile Include="..\libavfilter\vf_zoompan.c" />
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />
+    <ClCompile Include="..\libavfilter\vsrc_gradients.c" />
     <ClCompile Include="..\libavfilter\vsrc_life.c" />
     <ClCompile Include="..\libavfilter\vsrc_mandelbrot.c" />
     <ClCompile Include="..\libavfilter\vsrc_mptestsrc.c" />
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index b0563b197d..6ab8a8eab0 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -906,6 +906,9 @@
     <ClCompile Include="..\libavfilter\vf_scale_qsv.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_scdet.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_scroll.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -978,6 +981,9 @@
     <ClCompile Include="..\libavfilter\vf_unsharp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_untile.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_uspp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1026,6 +1032,9 @@
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vsrc_gradients.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vsrc_life.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index bd5acd54a6..e6257497d3 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -312,6 +312,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_scale,
     &ff_vf_scale_qsv,
     &ff_vf_scale2ref,
+    &ff_vf_scdet,
     &ff_vf_scroll,
     &ff_vf_select,
     &ff_vf_selectivecolor,
@@ -359,6 +360,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_trim,
     &ff_vf_unpremultiply,
     &ff_vf_unsharp,
+    &ff_vf_untile,
     &ff_vf_uspp,
     &ff_vf_v360,
     &ff_vf_vaguedenoiser,
@@ -384,6 +386,7 @@ static const AVFilter *filter_list[] = {
     &ff_vsrc_allyuv,
     &ff_vsrc_cellauto,
     &ff_vsrc_color,
+    &ff_vsrc_gradients,
     &ff_vsrc_haldclutsrc,
     &ff_vsrc_life,
     &ff_vsrc_mandelbrot,
diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
index ab62b65e21..37b0e46ef9 100644
--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
@@ -354,7 +354,6 @@
     <ClCompile Include="..\libavformat\av1dec.c" />
     <ClCompile Include="..\libavformat\oggdec.c" />
     <ClCompile Include="..\libavformat\oggparsecelt.c" />
-    <ClCompile Include="..\libavformat\oggparsedaala.c" />
     <ClCompile Include="..\libavformat\oggparsedirac.c" />
     <ClCompile Include="..\libavformat\oggparseflac.c" />
     <ClCompile Include="..\libavformat\oggparseogm.c" />
diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
index 90b2a6f14a..0df4111ea3 100644
--- a/SMP/libavformat.vcxproj.filters
+++ b/SMP/libavformat.vcxproj.filters
@@ -913,9 +913,6 @@
     <ClCompile Include="..\libavformat\oggparsecelt.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavformat\oggparsedaala.c">
-      <Filter>Source Files\libavformat</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavformat\oggparsedirac.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
diff --git a/SMP/libavutil.def b/SMP/libavutil.def
index 5c590071fd..7f26825d33 100644
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -208,6 +208,7 @@ EXPORTS
     av_free
     av_freep
     av_gcd
+    av_gcd_q
     av_get_alt_sample_fmt
     av_get_bits_per_pixel
     av_get_bytes_per_sample
@@ -261,6 +262,7 @@ EXPORTS
     av_hwdevice_ctx_alloc
     av_hwdevice_ctx_create
     av_hwdevice_ctx_create_derived
+    av_hwdevice_ctx_create_derived_opts
     av_hwdevice_ctx_init
     av_hwdevice_find_type_by_name
     av_hwdevice_get_hwframe_constraints
@@ -499,6 +501,8 @@ EXPORTS
     av_utf8_decode
     av_vbprintf
     av_version_info
+    av_video_enc_params_alloc
+    av_video_enc_params_create_side_data
     av_vlog
     av_write_image_line
     av_write_image_line2
diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj
index 684713bfe5..fac988f9f4 100644
--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -138,6 +138,7 @@
     <ClCompile Include="..\libavutil\tx_float.c" />
     <ClCompile Include="..\libavutil\tx_double.c" />
     <ClCompile Include="..\libavutil\tx_int32.c" />
+    <ClCompile Include="..\libavutil\video_enc_params.c" />
     <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
@@ -251,6 +252,7 @@
     <ClInclude Include="..\libavutil\tree.h" />
     <ClInclude Include="..\libavutil\twofish.h" />
     <ClInclude Include="..\libavutil\version.h" />
+    <ClInclude Include="..\libavutil\video_enc_params.h" />
     <ClInclude Include="..\libavutil\xtea.h" />
     <ClInclude Include="..\libavutil\tea.h" />
     <ClInclude Include="..\libavutil\tx.h" />
@@ -559,6 +561,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -709,6 +712,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -866,6 +870,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1021,6 +1026,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1177,6 +1183,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1331,6 +1338,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1493,6 +1501,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1654,6 +1663,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1816,6 +1826,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
@@ -1977,6 +1988,7 @@ copy ..\libavutil\timestamp.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tree.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\twofish.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\version.h "$(OutDir)"\include\libavutil
+copy ..\libavutil\video_enc_params.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\xtea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tea.h "$(OutDir)"\include\libavutil
 copy ..\libavutil\tx.h "$(OutDir)"\include\libavutil
diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters
index f0f40ed6a3..c80d7cb9a4 100644
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -270,6 +270,9 @@
     <ClCompile Include="..\libavutil\tx_int32.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\video_enc_params.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\hwcontext_cuda.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
@@ -569,6 +572,9 @@
     <ClInclude Include="..\libavutil\version.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\video_enc_params.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\xtea.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
diff --git a/SMP/libswscale/dce_defs.c b/SMP/libswscale/dce_defs.c
index af0ca4fa40..a72c7718f0 100644
--- a/SMP/libswscale/dce_defs.c
+++ b/SMP/libswscale/dce_defs.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "stdint.h"
 
+#include "libswscale/rgb2rgb.h"
 #include "libswscale/swscale_internal.h"
 
 SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c) {return *(SwsFunc*)(0);}
@@ -33,3 +34,19 @@ void ff_sws_init_swscale_arm(SwsContext *c) {return;}
 void ff_sws_init_swscale_ppc(SwsContext *c) {return;}
 void ff_yuv2rgb_init_tables_ppc(SwsContext *c, const int inv_table[4],
                                 int brightness, int contrast, int saturation) {return;}
+#if !(HAVE_AMD3DNOW_INLINE)
+void rgb2rgb_init_3dnow() {return;}
+#endif
+void rgb2rgb_init_aarch64(void) {return;}
+#if !(HAVE_AVX_INLINE)
+void rgb2rgb_init_avx() {return;}
+#endif
+#if !(HAVE_MMX_INLINE)
+void rgb2rgb_init_mmx() {return;}
+#endif
+#if !(HAVE_MMXEXT_INLINE)
+void rgb2rgb_init_mmxext() {return;}
+#endif
+#if !(HAVE_SSE2_INLINE)
+void rgb2rgb_init_sse2() {return;}
+#endif
-- 
GitLab