From 6b48d806e8d9552bd2f0380657bc880d1ff29b19 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 21 May 2017 15:40:39 +1000
Subject: [PATCH] project: Update for recent upstream merge.

---
 SMP/config.asm                  |  8 +++++++-
 SMP/config.h                    |  8 +++++++-
 SMP/ffmpeg.vcxproj              | 12 ++++++++++--
 SMP/ffplay.vcxproj              | 12 ++++++++++--
 SMP/ffprobe.vcxproj             | 12 ++++++++++--
 SMP/libavcodec/dce_defs.c       |  1 +
 SMP/libavfilter.vcxproj         |  1 +
 SMP/libavfilter.vcxproj.filters |  3 +++
 SMP/libavfilter/dce_defs.c      |  1 +
 SMP/libavutil.vcxproj           | 15 +++++++++++++++
 SMP/libavutil.vcxproj.filters   |  3 +++
 11 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index fcd2290ad2..f3bbe4f20b 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -370,6 +370,7 @@
 %define HAVE_ASM_MOD_Q 0
 %define HAVE_ATTRIBUTE_MAY_ALIAS 0
 %define HAVE_ATTRIBUTE_PACKED 0
+%define HAVE_BLOCKS_EXTENSION 0
 %define HAVE_EBP_AVAILABLE 1
 %define HAVE_EBX_AVAILABLE 1
 %define HAVE_GNU_AS 0
@@ -506,6 +507,7 @@
 %define CONFIG_LIBOPENMPT 0
 %define CONFIG_LIBOPUS 1
 %define CONFIG_LIBPULSE 0
+%define CONFIG_LIBRSVG 0
 %define CONFIG_LIBRTMP 0
 %define CONFIG_LIBSCHROEDINGER 0
 %define CONFIG_LIBSHINE 0
@@ -542,6 +544,7 @@
 %define CONFIG_VDPAU 0
 %define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_XVMC 0
+%define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
 %define CONFIG_LIBMFX 1
 %define CONFIG_MMAL 0
@@ -589,7 +592,6 @@
 %define CONFIG_NEON_CLOBBER_TEST 0
 %define CONFIG_OSSFUZZ 0
 %define CONFIG_PIC 0
-%define CONFIG_RAISE_MAJOR 0
 %define CONFIG_THUMB 0
 %define CONFIG_VALGRIND_BACKTRACE 0
 %define CONFIG_XMM_CLOBBER_TEST 0
@@ -1161,6 +1163,7 @@
 %define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
 %define CONFIG_LIBOPENJPEG_DECODER 0
 %define CONFIG_LIBOPUS_DECODER 0
+%define CONFIG_LIBRSVG_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 1
 %define CONFIG_LIBVORBIS_DECODER 1
@@ -1453,6 +1456,7 @@
 %define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
@@ -1710,6 +1714,7 @@
 %define CONFIG_CHORUS_FILTER 1
 %define CONFIG_COMPAND_FILTER 1
 %define CONFIG_COMPENSATIONDELAY_FILTER 1
+%define CONFIG_CROSSFEED_FILTER 1
 %define CONFIG_CRYSTALIZER_FILTER 1
 %define CONFIG_DCSHIFT_FILTER 1
 %define CONFIG_DYNAUDNORM_FILTER 1
@@ -1891,6 +1896,7 @@
 %define CONFIG_ROTATE_FILTER 1
 %define CONFIG_SAB_FILTER 1
 %define CONFIG_SCALE_FILTER 1
+%define CONFIG_SCALE_CUDA_FILTER 0
 %define CONFIG_SCALE_NPP_FILTER 0
 %define CONFIG_SCALE_QSV_FILTER 1
 %define CONFIG_SCALE_VAAPI_FILTER 0
diff --git a/SMP/config.h b/SMP/config.h
index 7cda19701f..da9fccd6e2 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -400,6 +400,7 @@
 #define HAVE_ASM_MOD_Q 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 0
 #define HAVE_ATTRIBUTE_PACKED 0
+#define HAVE_BLOCKS_EXTENSION 0
 #if HAVE_INLINE_ASM && !defined(_DEBUG)
 #   define HAVE_EBP_AVAILABLE 1
 #else
@@ -548,6 +549,7 @@
 #define CONFIG_LIBOPENMPT 0
 #define CONFIG_LIBOPUS 1
 #define CONFIG_LIBPULSE 0
+#define CONFIG_LIBRSVG 0
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSHINE 0
@@ -591,6 +593,7 @@
 #define CONFIG_VDPAU 0
 #define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_XVMC 0
+#define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 1
 #define CONFIG_MMAL 0
@@ -646,7 +649,6 @@
 #define CONFIG_NEON_CLOBBER_TEST 0
 #define CONFIG_OSSFUZZ 0
 #define CONFIG_PIC 0
-#define CONFIG_RAISE_MAJOR 0
 #define CONFIG_THUMB 0
 #define CONFIG_VALGRIND_BACKTRACE 0
 #define CONFIG_XMM_CLOBBER_TEST 0
@@ -1218,6 +1220,7 @@
 #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
 #define CONFIG_LIBOPENJPEG_DECODER 0
 #define CONFIG_LIBOPUS_DECODER 0
+#define CONFIG_LIBRSVG_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 1
 #define CONFIG_LIBVORBIS_DECODER 1
@@ -1510,6 +1513,7 @@
 #define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
@@ -1767,6 +1771,7 @@
 #define CONFIG_CHORUS_FILTER 1
 #define CONFIG_COMPAND_FILTER 1
 #define CONFIG_COMPENSATIONDELAY_FILTER 1
+#define CONFIG_CROSSFEED_FILTER 1
 #define CONFIG_CRYSTALIZER_FILTER 1
 #define CONFIG_DCSHIFT_FILTER 1
 #define CONFIG_DYNAUDNORM_FILTER 1
@@ -1948,6 +1953,7 @@
 #define CONFIG_ROTATE_FILTER 1
 #define CONFIG_SAB_FILTER 1
 #define CONFIG_SCALE_FILTER 1
+#define CONFIG_SCALE_CUDA_FILTER 0
 #define CONFIG_SCALE_NPP_FILTER 0
 #define CONFIG_SCALE_QSV_FILTER 1
 #define CONFIG_SCALE_VAAPI_FILTER 0
diff --git a/SMP/ffmpeg.vcxproj b/SMP/ffmpeg.vcxproj
index efb8c90901..86f9652602 100644
--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -145,37 +145,45 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffmpeg\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/SMP/ffplay.vcxproj b/SMP/ffplay.vcxproj
index be4cdafd8d..0dd08aa28e 100644
--- a/SMP/ffplay.vcxproj
+++ b/SMP/ffplay.vcxproj
@@ -140,37 +140,45 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffplay\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/SMP/ffprobe.vcxproj b/SMP/ffprobe.vcxproj
index 96867ab904..247f916b65 100644
--- a/SMP/ffprobe.vcxproj
+++ b/SMP/ffprobe.vcxproj
@@ -140,37 +140,45 @@
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <LinkIncremental>false</LinkIncremental>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x86\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
     <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+    <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\ffprobe\</IntDir>
+    <LocalDebuggerWorkingDirectory>$(OutDir)\bin\x64\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/SMP/libavcodec/dce_defs.c b/SMP/libavcodec/dce_defs.c
index b6946c91c7..327f0f37b7 100644
--- a/SMP/libavcodec/dce_defs.c
+++ b/SMP/libavcodec/dce_defs.c
@@ -3661,6 +3661,7 @@ AVCodec ff_libopenh264_encoder = {0};
 AVCodec ff_libopenjpeg_decoder = {0};
 AVCodec ff_libopenjpeg_encoder = {0};
 AVCodec ff_libopus_decoder = {0};
+AVCodec ff_librsvg_decoder = {0};
 AVCodec ff_libschroedinger_decoder = {0};
 AVCodec ff_libschroedinger_encoder = {0};
 AVCodec ff_libshine_encoder = {0};
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index 1e88420802..cfd46d1f77 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -158,6 +158,7 @@
     <ClCompile Include="..\libavfilter\af_chorus.c" />
     <ClCompile Include="..\libavfilter\af_compand.c" />
     <ClCompile Include="..\libavfilter\af_compensationdelay.c" />
+    <ClCompile Include="..\libavfilter\af_crossfeed.c" />
     <ClCompile Include="..\libavfilter\af_crystalizer.c" />
     <ClCompile Include="..\libavfilter\af_dcshift.c" />
     <ClCompile Include="..\libavfilter\af_dynaudnorm.c" />
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 2dbeefc4f4..70cdaa2cd6 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -297,6 +297,9 @@
     <ClCompile Include="..\libavfilter\af_compensationdelay.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_crossfeed.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_crystalizer.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter/dce_defs.c b/SMP/libavfilter/dce_defs.c
index 4ddcd99e9b..0e0b8a6995 100644
--- a/SMP/libavfilter/dce_defs.c
+++ b/SMP/libavfilter/dce_defs.c
@@ -199,6 +199,7 @@ AVFilter ff_vf_deinterlace_vaapi = {0};
 AVFilter ff_vf_frei0r = {0};
 AVFilter ff_vf_ocr = {0};
 AVFilter ff_vf_ocv = {0};
+AVFilter ff_vf_scale_cuda = {0};
 AVFilter ff_vf_scale_npp = {0};
 AVFilter ff_vf_scale_vaapi = {0};
 AVFilter ff_vf_vidstabdetect = {0};
diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj
index 214b09d235..22eca1e54c 100644
--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -206,6 +206,7 @@
     <ClInclude Include="..\libavutil\hwcontext_dxva2.h" />
     <ClInclude Include="..\libavutil\hwcontext_qsv.h" />
     <ClInclude Include="..\libavutil\hwcontext_vaapi.h" />
+    <ClInclude Include="..\libavutil\hwcontext_videotoolbox.h" />
     <ClInclude Include="..\libavutil\hwcontext_vdpau.h" />
     <ClInclude Include="..\libavutil\imgutils.h" />
     <ClInclude Include="..\libavutil\intfloat.h" />
@@ -552,6 +553,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -692,6 +694,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -838,6 +841,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -983,6 +987,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1129,6 +1134,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1274,6 +1280,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1420,6 +1427,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1566,6 +1574,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1720,6 +1729,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -1873,6 +1883,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2027,6 +2038,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2180,6 +2192,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2326,6 +2339,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
@@ -2472,6 +2486,7 @@ copy ..\libavutil\hwcontext_cuda.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_dxva2.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_qsv.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vaapi.h $(OutDir)\include\libavutil
+copy ..\libavutil\hwcontext_videotoolbox.h $(OutDir)\include\libavutil
 copy ..\libavutil\hwcontext_vdpau.h $(OutDir)\include\libavutil
 copy ..\libavutil\imgutils.h $(OutDir)\include\libavutil
 copy ..\libavutil\intfloat.h $(OutDir)\include\libavutil
diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters
index 0180a97baa..a2e75b9323 100644
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -407,6 +407,9 @@
     <ClInclude Include="..\libavutil\hwcontext_vaapi.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_videotoolbox.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
     <ClInclude Include="..\libavutil\hwcontext_vdpau.h">
       <Filter>Header Files\libavutil</Filter>
     </ClInclude>
-- 
GitLab