From 8bb12d3ee9b22baa5fe4a89341dd697849dc17ae Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 11 Aug 2019 19:43:44 +1000
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm                  |  2 ++
 SMP/config.h                    |  2 ++
 SMP/libavfilter.vcxproj         | 12 ++++++++---
 SMP/libavfilter.vcxproj.filters | 35 +++++++++++++++++++++++----------
 SMP/libavfilter/filter_list.c   |  1 +
 SMP/libavutil.vcxproj           |  2 ++
 SMP/libavutil.vcxproj.filters   |  6 ++++++
 SMP/libavutil/ffversion.h       |  2 +-
 8 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index 6bd674b4ca..3d20c34e2c 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -544,6 +544,7 @@
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CRYSTALHD 0
 %define CONFIG_CUDA 1
+%define CONFIG_CUDA_LLVM 0
 %define CONFIG_CUVID 1
 %define CONFIG_D3D11VA 1
 %define CONFIG_DXVA2 1
@@ -1714,6 +1715,7 @@
 %define CONFIG_SINC_FILTER 1
 %define CONFIG_SINE_FILTER 1
 %define CONFIG_ANULLSINK_FILTER 1
+%define CONFIG_ADDROI_FILTER 1
 %define CONFIG_ALPHAEXTRACT_FILTER 1
 %define CONFIG_ALPHAMERGE_FILTER 1
 %define CONFIG_AMPLIFY_FILTER 1
diff --git a/SMP/config.h b/SMP/config.h
index 80a19d21b4..35688fd39d 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -602,6 +602,7 @@
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_CUDA 1
+#define CONFIG_CUDA_LLVM 0
 #define CONFIG_CUVID 1
 #if defined(NTDDI_WIN8)
 #   define CONFIG_D3D11VA 1
@@ -1836,6 +1837,7 @@
 #define CONFIG_SINC_FILTER 1
 #define CONFIG_SINE_FILTER 1
 #define CONFIG_ANULLSINK_FILTER 1
+#define CONFIG_ADDROI_FILTER 1
 #define CONFIG_ALPHAEXTRACT_FILTER 1
 #define CONFIG_ALPHAMERGE_FILTER 1
 #define CONFIG_AMPLIFY_FILTER 1
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index bcf593b099..aa2002797b 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -66,6 +66,7 @@
     <NASM Include="..\libavfilter\x86\vf_blend.asm" />
     <NASM Include="..\libavfilter\x86\vf_bwdif.asm" />
     <NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
+    <NASM Include="..\libavfilter\x86\vf_convolution.asm" />
     <NASM Include="..\libavfilter\x86\vf_framerate.asm" />
     <NASM Include="..\libavfilter\x86\vf_fspp.asm" />
     <NASM Include="..\libavfilter\x86\vf_gblur.asm" />
@@ -109,8 +110,6 @@
     <ClCompile Include="..\libavfilter\video.c" />
     <ClCompile Include="..\libavfilter\pthread.c" />
     <ClCompile Include="..\libavfilter\qsvvpp.c" />
-    <ClCompile Include="..\libavfilter\dnn_interface.c" />
-    <ClCompile Include="..\libavfilter\dnn_backend_native.c" />
     <ClCompile Include="..\libavfilter\f_bench.c" />
     <ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
     <ClCompile Include="..\libavfilter\af_acontrast.c" />
@@ -203,6 +202,7 @@
     <ClCompile Include="..\libavfilter\asrc_sinc.c" />
     <ClCompile Include="..\libavfilter\asrc_sine.c" />
     <ClCompile Include="..\libavfilter\asink_anullsink.c" />
+    <ClCompile Include="..\libavfilter\vf_addroi.c" />
     <ClCompile Include="..\libavfilter\vf_extractplanes.c" />
     <ClCompile Include="..\libavfilter\vf_alphamerge.c" />
     <ClCompile Include="..\libavfilter\vf_amplify.c" />
@@ -229,7 +229,6 @@
     <ClCompile Include="..\libavfilter\vf_colormatrix.c" />
     <ClCompile Include="..\libavfilter\vf_colorspace.c" />
     <ClCompile Include="..\libavfilter\colorspace.c" />
-    <ClCompile Include="..\libavfilter\vf_convolution.c" />
     <ClCompile Include="..\libavfilter\vf_convolve.c" />
     <ClCompile Include="..\libavfilter\vf_copy.c" />
     <ClCompile Include="..\libavfilter\vf_cover_rect.c" />
@@ -391,12 +390,16 @@
     <ClCompile Include="..\libavfilter\avf_showwaves.c" />
     <ClCompile Include="..\libavfilter\vaf_spectrumsynth.c" />
     <ClCompile Include="..\libavfilter\src_movie.c" />
+    <ClCompile Include="..\libavfilter\dnn\dnn_interface.c" />
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c" />
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_pad.c" />
     <ClCompile Include="..\libavfilter\x86\scene_sad_init.c" />
     <ClCompile Include="..\libavfilter\x86\af_afir_init.c" />
     <ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_blend_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c" />
     <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />
+    <ClCompile Include="..\libavfilter\x86\vf_convolution_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_gblur_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c" />
@@ -442,6 +445,9 @@
     <ClCompile Include="..\libavfilter\colorspacedsp.c">
       <ObjectFileName>$(IntDir)\libavfilter_colorspacedsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_convolution.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_convolution.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_framerate.c">
       <ObjectFileName>$(IntDir)\libavfilter_vf_framerate.obj</ObjectFileName>
     </ClCompile>
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 62c6df799f..45650280e9 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -19,9 +19,12 @@
     <Filter Include="Source Files\libavfilter">
       <UniqueIdentifier>{bf017c32-250d-47da-b7e6-d5a5091cb1e6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\libavfilter\x86">
+    <Filter Include="Source Files\libavfilter\dnn">
       <UniqueIdentifier>{fd9e10e9-18f6-437d-b5d7-17290540c8b8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\libavfilter\x86">
+      <UniqueIdentifier>{f026e68e-ff14-4bf4-8758-6384ac7bcfaf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include=".\libavfilter.def">
@@ -52,6 +55,9 @@
     <NASM Include="..\libavfilter\x86\colorspacedsp.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
+    <NASM Include="..\libavfilter\x86\vf_convolution.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </NASM>
     <NASM Include="..\libavfilter\x86\vf_framerate.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </NASM>
@@ -177,12 +183,6 @@
     <ClCompile Include="..\libavfilter\qsvvpp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\dnn_interface.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavfilter\dnn_backend_native.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\f_bench.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -459,6 +459,9 @@
     <ClCompile Include="..\libavfilter\asink_anullsink.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_addroi.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_extractplanes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -537,9 +540,6 @@
     <ClCompile Include="..\libavfilter\colorspace.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_convolution.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_convolve.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1023,6 +1023,15 @@
     <ClCompile Include="..\libavfilter\src_movie.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\dnn_interface.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_pad.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\scene_sad_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -1041,6 +1050,9 @@
     <ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\vf_convolution_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
@@ -1134,6 +1146,9 @@
     <ClCompile Include="..\libavfilter\colorspacedsp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_convolution.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_framerate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index 4e8a555542..4876c79e8f 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -127,6 +127,7 @@ static const AVFilter *filter_list[] = {
     &ff_asrc_sinc,
     &ff_asrc_sine,
     &ff_asink_anullsink,
+    &ff_vf_addroi,
     &ff_vf_alphaextract,
     &ff_vf_alphamerge,
     &ff_vf_amplify,
diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj
index 44e00135cd..85a4144ed0 100644
--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -134,6 +134,8 @@
     <ClCompile Include="..\libavutil\xtea.c" />
     <ClCompile Include="..\libavutil\tea.c" />
     <ClCompile Include="..\libavutil\tx.c" />
+    <ClCompile Include="..\libavutil\tx_float.c" />
+    <ClCompile Include="..\libavutil\tx_double.c" />
     <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
     <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
     <ClCompile Include="..\libavutil\lzo.c" />
diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters
index 4dfa1ea0d8..4a6d147c0b 100644
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -258,6 +258,12 @@
     <ClCompile Include="..\libavutil\tx.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavutil\tx_float.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavutil\tx_double.c">
+      <Filter>Source Files\libavutil</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavutil\hwcontext_cuda.c">
       <Filter>Source Files\libavutil</Filter>
     </ClCompile>
diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h
index 2856c192e3..1fdba66be9 100644
--- a/SMP/libavutil/ffversion.h
+++ b/SMP/libavutil/ffversion.h
@@ -21,5 +21,5 @@
 
 #ifndef SMP_LIBAVUTIL_FFVERSION_H
 #define SMP_LIBAVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "4.1.git"
+#define FFMPEG_VERSION "4.2.git"
 #endif /* SMP_LIBAVUTIL_FFVERSION_H */
-- 
GitLab