project: Update for recent upstream merge.

6fdf4277 · Matt Oliver · 8d69b403 · 6fdf4277 · 6fdf4277 · 6fdf4277
11 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -387,6 +387,7 @@
 %define HAVE_XFORM_ASM 0
 %define HAVE_XMM_CLOBBERS 1
 %define HAVE_CONDITION_VARIABLE_PTR 1
+%define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 %define HAVE_SOCKLEN_T 1
 %define HAVE_STRUCT_ADDRINFO 1
 %define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -478,6 +479,7 @@
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
 %define CONFIG_LIBVO_AMRWBENC 0
+%define CONFIG_RKMPP 0
 %define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_CHROMAPRINT 0
 %define CONFIG_GCRYPT 0
@@ -792,11 +794,13 @@
 %define CONFIG_H264_MEDIACODEC_DECODER 0
 %define CONFIG_H264_MMAL_DECODER 0
 %define CONFIG_H264_QSV_DECODER 1
+%define CONFIG_H264_RKMPP_DECODER 0
 %define CONFIG_H264_VDA_DECODER 0
 %define CONFIG_H264_VDPAU_DECODER 0
 %define CONFIG_HAP_DECODER 1
 %define CONFIG_HEVC_DECODER 1
 %define CONFIG_HEVC_QSV_DECODER 1
+%define CONFIG_HEVC_RKMPP_DECODER 0
 %define CONFIG_HEVC_V4L2M2M_DECODER 0
 %define CONFIG_HNM4_VIDEO_DECODER 1
 %define CONFIG_HQ_HQA_DECODER 1
@@ -943,8 +947,10 @@
 %define CONFIG_VP6F_DECODER 1
 %define CONFIG_VP7_DECODER 1
 %define CONFIG_VP8_DECODER 1
+%define CONFIG_VP8_RKMPP_DECODER 0
 %define CONFIG_VP8_V4L2M2M_DECODER 0
 %define CONFIG_VP9_DECODER 1
+%define CONFIG_VP9_RKMPP_DECODER 0
 %define CONFIG_VP9_V4L2M2M_DECODER 0
 %define CONFIG_VQA_DECODER 1
 %define CONFIG_BITPACKED_DECODER 1
@@ -1516,10 +1522,7 @@
 %define CONFIG_H261_ENCODER 1
 %define CONFIG_H263_ENCODER 1
 %define CONFIG_H263P_ENCODER 1
-%define CONFIG_H263_V4L2M2M_ENCODER 0
-%define CONFIG_H264_V4L2M2M_ENCODER 0
 %define CONFIG_HAP_ENCODER 0
-%define CONFIG_HEVC_V4L2M2M_ENCODER 0
 %define CONFIG_HUFFYUV_ENCODER 1
 %define CONFIG_JPEG2000_ENCODER 1
 %define CONFIG_JPEGLS_ENCODER 1
@@ -1528,7 +1531,6 @@
 %define CONFIG_MPEG1VIDEO_ENCODER 1
 %define CONFIG_MPEG2VIDEO_ENCODER 1
 %define CONFIG_MPEG4_ENCODER 1
-%define CONFIG_MPEG4_V4L2M2M_ENCODER 0
 %define CONFIG_MSMPEG4V2_ENCODER 1
 %define CONFIG_MSMPEG4V3_ENCODER 1
 %define CONFIG_MSVIDEO1_ENCODER 1
@@ -1562,7 +1564,6 @@
 %define CONFIG_V408_ENCODER 1
 %define CONFIG_V410_ENCODER 1
 %define CONFIG_VC2_ENCODER 1
-%define CONFIG_VP8_V4L2M2M_ENCODER 0
 %define CONFIG_WRAPPED_AVFRAME_ENCODER 1
 %define CONFIG_WMV1_ENCODER 1
 %define CONFIG_WMV2_ENCODER 1
@@ -1673,10 +1674,12 @@
 %define CONFIG_LIBX265_ENCODER 1
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 1
+%define CONFIG_H263_V4L2M2M_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_NVENC_ENCODER 1
 %define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
+%define CONFIG_H264_V4L2M2M_ENCODER 0
 %define CONFIG_H264_VAAPI_ENCODER 0
 %define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 1
@@ -1684,11 +1687,14 @@
 %define CONFIG_NVENC_HEVC_ENCODER 1
 %define CONFIG_HEVC_NVENC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
+%define CONFIG_HEVC_V4L2M2M_ENCODER 0
 %define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MJPEG_VAAPI_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
 %define CONFIG_MPEG2_VAAPI_ENCODER 0
+%define CONFIG_MPEG4_V4L2M2M_ENCODER 0
+%define CONFIG_VP8_V4L2M2M_ENCODER 0
 %define CONFIG_VP8_VAAPI_ENCODER 0
 %define CONFIG_VP9_VAAPI_ENCODER 0
 %define CONFIG_ABENCH_FILTER 1
@@ -1990,6 +1996,7 @@
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 1
+%define CONFIG_VMAFMOTION_FILTER 1
 %define CONFIG_VSTACK_FILTER 1
 %define CONFIG_W3FDIF_FILTER 1
 %define CONFIG_WAVEFORM_FILTER 1
@@ -2055,6 +2062,7 @@
 %define CONFIG_HEVC_QSV_HWACCEL 1
 %define CONFIG_HEVC_VAAPI_HWACCEL 0
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
+%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MJPEG_CUVID_HWACCEL 1
 %define CONFIG_MPEG1_CUVID_HWACCEL 1
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
@@ -2105,7 +2113,6 @@
 %define CONFIG_DECKLINK_INDEV 0
 %define CONFIG_LIBNDI_NEWTEK_INDEV 0
 %define CONFIG_DSHOW_INDEV 1
-%define CONFIG_DV1394_INDEV 0
 %define CONFIG_FBDEV_INDEV 0
 %define CONFIG_GDIGRAB_INDEV 1
 %define CONFIG_IEC61883_INDEV 0

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -425,6 +425,7 @@
 #define HAVE_XFORM_ASM 0
 #define HAVE_XMM_CLOBBERS 1
 #define HAVE_CONDITION_VARIABLE_PTR 1
+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0
 #define HAVE_SOCKLEN_T 1
 #define HAVE_STRUCT_ADDRINFO 1
 #define HAVE_STRUCT_GROUP_SOURCE_REQ 1
@@ -520,6 +521,7 @@
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
 #define CONFIG_LIBVO_AMRWBENC 0
+#define CONFIG_RKMPP 0
 #define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_CHROMAPRINT 0
 #define CONFIG_GCRYPT 0
@@ -849,11 +851,13 @@
 #define CONFIG_H264_MEDIACODEC_DECODER 0
 #define CONFIG_H264_MMAL_DECODER 0
 #define CONFIG_H264_QSV_DECODER 1
+#define CONFIG_H264_RKMPP_DECODER 0
 #define CONFIG_H264_VDA_DECODER 0
 #define CONFIG_H264_VDPAU_DECODER 0
 #define CONFIG_HAP_DECODER 1
 #define CONFIG_HEVC_DECODER 1
 #define CONFIG_HEVC_QSV_DECODER 1
+#define CONFIG_HEVC_RKMPP_DECODER 0
 #define CONFIG_HEVC_V4L2M2M_DECODER 0
 #define CONFIG_HNM4_VIDEO_DECODER 1
 #define CONFIG_HQ_HQA_DECODER 1
@@ -1000,8 +1004,10 @@
 #define CONFIG_VP6F_DECODER 1
 #define CONFIG_VP7_DECODER 1
 #define CONFIG_VP8_DECODER 1
+#define CONFIG_VP8_RKMPP_DECODER 0
 #define CONFIG_VP8_V4L2M2M_DECODER 0
 #define CONFIG_VP9_DECODER 1
+#define CONFIG_VP9_RKMPP_DECODER 0
 #define CONFIG_VP9_V4L2M2M_DECODER 0
 #define CONFIG_VQA_DECODER 1
 #define CONFIG_BITPACKED_DECODER 1
@@ -1573,10 +1579,7 @@
 #define CONFIG_H261_ENCODER 1
 #define CONFIG_H263_ENCODER 1
 #define CONFIG_H263P_ENCODER 1
-#define CONFIG_H263_V4L2M2M_ENCODER 0
-#define CONFIG_H264_V4L2M2M_ENCODER 0
 #define CONFIG_HAP_ENCODER 0
-#define CONFIG_HEVC_V4L2M2M_ENCODER 0
 #define CONFIG_HUFFYUV_ENCODER 1
 #define CONFIG_JPEG2000_ENCODER 1
 #define CONFIG_JPEGLS_ENCODER 1
@@ -1585,7 +1588,6 @@
 #define CONFIG_MPEG1VIDEO_ENCODER 1
 #define CONFIG_MPEG2VIDEO_ENCODER 1
 #define CONFIG_MPEG4_ENCODER 1
-#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
 #define CONFIG_MSMPEG4V2_ENCODER 1
 #define CONFIG_MSMPEG4V3_ENCODER 1
 #define CONFIG_MSVIDEO1_ENCODER 1
@@ -1619,7 +1621,6 @@
 #define CONFIG_V408_ENCODER 1
 #define CONFIG_V410_ENCODER 1
 #define CONFIG_VC2_ENCODER 1
-#define CONFIG_VP8_V4L2M2M_ENCODER 0
 #define CONFIG_WRAPPED_AVFRAME_ENCODER 1
 #define CONFIG_WMV1_ENCODER 1
 #define CONFIG_WMV2_ENCODER 1
@@ -1730,10 +1731,12 @@
 #define CONFIG_LIBX265_ENCODER 1
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 1
+#define CONFIG_H263_V4L2M2M_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_NVENC_ENCODER 1
 #define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
+#define CONFIG_H264_V4L2M2M_ENCODER 0
 #define CONFIG_H264_VAAPI_ENCODER 0
 #define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 1
@@ -1741,11 +1744,14 @@
 #define CONFIG_NVENC_HEVC_ENCODER 1
 #define CONFIG_HEVC_NVENC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
 #define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MJPEG_VAAPI_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
 #define CONFIG_MPEG2_VAAPI_ENCODER 0
+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
+#define CONFIG_VP8_V4L2M2M_ENCODER 0
 #define CONFIG_VP8_VAAPI_ENCODER 0
 #define CONFIG_VP9_VAAPI_ENCODER 0
 #define CONFIG_ABENCH_FILTER 1
@@ -2047,6 +2053,7 @@
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 1
+#define CONFIG_VMAFMOTION_FILTER 1
 #define CONFIG_VSTACK_FILTER 1
 #define CONFIG_W3FDIF_FILTER 1
 #define CONFIG_WAVEFORM_FILTER 1
@@ -2112,6 +2119,7 @@
 #define CONFIG_HEVC_QSV_HWACCEL 1
 #define CONFIG_HEVC_VAAPI_HWACCEL 0
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MJPEG_CUVID_HWACCEL 1
 #define CONFIG_MPEG1_CUVID_HWACCEL 1
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
@@ -2183,7 +2191,6 @@
 #define CONFIG_DECKLINK_INDEV 0
 #define CONFIG_LIBNDI_NEWTEK_INDEV 0
 #define CONFIG_DSHOW_INDEV 1
-#define CONFIG_DV1394_INDEV 0
 #define CONFIG_FBDEV_INDEV 0
 #define CONFIG_GDIGRAB_INDEV 1
 #define CONFIG_IEC61883_INDEV 0

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -210,6 +210,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -261,6 +262,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -314,6 +316,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -353,7 +356,6 @@ del ..\libavutil\ffversion.h
      <FloatingPointModel>Precise</FloatingPointModel>
      <MinimalRebuild>false</MinimalRebuild>
      <DisableSpecificWarnings>4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -365,6 +367,8 @@ del ..\libavutil\ffversion.h
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
+      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -422,6 +426,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -478,6 +483,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -535,6 +541,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -591,6 +598,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>

--- a/SMP/ffplay.vcxproj
+++ b/SMP/ffplay.vcxproj
@@ -205,6 +205,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -256,6 +257,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -309,6 +311,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -348,7 +351,6 @@ del ..\libavutil\ffversion.h
      <FloatingPointModel>Precise</FloatingPointModel>
      <MinimalRebuild>false</MinimalRebuild>
      <DisableSpecificWarnings>4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -360,6 +362,8 @@ del ..\libavutil\ffversion.h
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
+      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -417,6 +421,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -473,6 +478,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -530,6 +536,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -586,6 +593,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>

--- a/SMP/ffprobe.vcxproj
+++ b/SMP/ffprobe.vcxproj
@@ -205,6 +205,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -256,6 +257,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -309,6 +311,7 @@ del ..\libavutil\ffversion.h
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -348,7 +351,6 @@ del ..\libavutil\ffversion.h
      <FloatingPointModel>Precise</FloatingPointModel>
      <MinimalRebuild>false</MinimalRebuild>
      <DisableSpecificWarnings>4244;4267;4018;4146;4028;4996;4090;4114;4308;4305;4005;4101;4554;4307;4273;4133;4544;4334;4293;4047;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -360,6 +362,8 @@ del ..\libavutil\ffversion.h
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
+      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -417,6 +421,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -473,6 +478,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -530,6 +536,7 @@ del ..\libavutil\ffversion.h
      <LargeAddressAware>true</LargeAddressAware>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>
@@ -586,6 +593,7 @@ del ..\libavutil\ffversion.h
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
      <MinimumRequiredVersion>6.0</MinimumRequiredVersion>
+      <ImportLibrary>$(IntDir)\$(TargetName).lib</ImportLibrary>
    </Link>
    <PostBuildEvent>
      <Command>

--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -3631,6 +3631,7 @@ const AVCodec ff_h264_crystalhd_decoder = {0};
 const AVCodec ff_h264_mediacodec_decoder = {0};
 const AVCodec ff_h264_mmal_decoder = {0};
 const AVCodec ff_h264_omx_encoder = {0};
+const AVCodec ff_h264_rkmpp_decoder = {0};
 const AVCodec ff_h264_v4l2m2m_decoder = {0};
 const AVCodec ff_h264_v4l2m2m_encoder = {0};
 const AVCodec ff_h264_vaapi_encoder = {0};
@@ -3639,6 +3640,7 @@ const AVCodec ff_h264_vdpau_decoder = {0};
 const AVCodec ff_h264_videotoolbox_encoder = {0};
 const AVCodec ff_hap_encoder = {0};
 const AVCodec ff_hevc_mediacodec_decoder = {0};
+const AVCodec ff_hevc_rkmpp_decoder = {0};
 const AVCodec ff_hevc_v4l2m2m_decoder = {0};
 const AVCodec ff_hevc_v4l2m2m_encoder = {0};
 const AVCodec ff_hevc_vaapi_encoder = {0};
@@ -3700,10 +3702,12 @@ const AVCodec ff_vc1_mmal_decoder = {0};
 const AVCodec ff_vc1_v4l2m2m_decoder = {0};
 const AVCodec ff_vc1_vdpau_decoder = {0};
 const AVCodec ff_vp8_mediacodec_decoder = {0};
+const AVCodec ff_vp8_rkmpp_decoder = {0};
 const AVCodec ff_vp8_v4l2m2m_decoder = {0};
 const AVCodec ff_vp8_v4l2m2m_encoder = {0};
 const AVCodec ff_vp8_vaapi_encoder = {0};
 const AVCodec ff_vp9_mediacodec_decoder = {0};
+const AVCodec ff_vp9_rkmpp_decoder = {0};
 const AVCodec ff_vp9_v4l2m2m_decoder = {0};
 const AVCodec ff_vp9_vaapi_encoder = {0};
 const AVCodec ff_wmv3_crystalhd_decoder = {0};
@@ -3732,6 +3736,7 @@ const AVHWAccel ff_hevc_d3d11va_hwaccel = {0};
 const AVHWAccel ff_hevc_mediacodec_hwaccel = {0};
 const AVHWAccel ff_hevc_vaapi_hwaccel = {0};
 const AVHWAccel ff_hevc_vdpau_hwaccel = {0};
+const AVHWAccel ff_hevc_videotoolbox_hwaccel = {0};
 const AVHWAccel ff_mpeg1_vdpau_hwaccel = {0};
 const AVHWAccel ff_mpeg1_videotoolbox_hwaccel = {0};
 const AVHWAccel ff_mpeg1_xvmc_hwaccel = {0};

--- a/SMP/libavdevice/dce_defs.c
+++ b/SMP/libavdevice/dce_defs.c
@@ -27,7 +27,6 @@ const AVInputFormat ff_alsa_demuxer = {0};
 const AVInputFormat ff_avfoundation_demuxer = {0};
 const AVInputFormat ff_bktr_demuxer = {0};
 const AVInputFormat ff_decklink_demuxer = {0};
-const AVInputFormat ff_dv1394_demuxer = {0};
 const AVInputFormat ff_fbdev_demuxer = {0};
 const AVInputFormat ff_iec61883_demuxer = {0};
 const AVInputFormat ff_jack_demuxer = {0};

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -334,6 +334,7 @@
    <ClCompile Include="..\libavfilter\vf_vectorscope.c" />
    <ClCompile Include="..\libavfilter\vf_vflip.c" />
    <ClCompile Include="..\libavfilter\vf_vignette.c" />
+    <ClCompile Include="..\libavfilter\vf_vmafmotion.c" />
    <ClCompile Include="..\libavfilter\vf_waveform.c" />
    <ClCompile Include="..\libavfilter\vf_xbr.c" />
    <ClCompile Include="..\libavfilter\vf_zoompan.c" />

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -825,6 +825,9 @@
    <ClCompile Include="..\libavfilter\vf_vignette.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_vmafmotion.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_waveform.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -87,6 +87,7 @@ EXPORTS
    av_content_light_metadata_alloc
    av_content_light_metadata_create_side_data
    av_cpu_count
+    av_cpu_max_align
    av_crc
    av_crc_get_table
    av_crc_init

--- a/SMP/libavutil/dce_defs.c
+++ b/SMP/libavutil/dce_defs.c
@@ -27,6 +27,9 @@
 int ff_get_cpu_flags_aarch64(void) {return 0;}
 int ff_get_cpu_flags_arm(void) {return 0;}
 int ff_get_cpu_flags_ppc(void) {return 0;}
+size_t ff_get_cpu_max_align_aarch64(void) {return *(size_t*)(0);}
+size_t ff_get_cpu_max_align_arm(void) {return *(size_t*)(0);}
+size_t ff_get_cpu_max_align_ppc(void) {return *(size_t*)(0);}
 void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp) {return;}
 void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) {return;}
 void ff_float_dsp_init_mips(AVFloatDSPContext *fdsp) {return;}