projects: Update for recent merge/update.

SMP/config.asm

@@ -445,6 +445,7 @@
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
 %define CONFIG_LZMA 1
+%define CONFIG_NVENC 0
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 1
 %define CONFIG_OPENGL 1
@@ -1245,6 +1246,7 @@
 %define CONFIG_MSMPEG4V2_ENCODER 1
 %define CONFIG_MSMPEG4V3_ENCODER 1
 %define CONFIG_MSVIDEO1_ENCODER 1
+%define CONFIG_NVENC_ENCODER 0
 %define CONFIG_PAM_ENCODER 1
 %define CONFIG_PBM_ENCODER 1
 %define CONFIG_PCX_ENCODER 1
@@ -1534,6 +1536,7 @@
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
+%define CONFIG_USPP_FILTER 1
 %define CONFIG_VFLIP_FILTER 1
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0

SMP/config.h

@@ -480,6 +480,7 @@
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
 #define CONFIG_LZMA 1
+#define CONFIG_NVENC 0
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 1
 #define CONFIG_OPENGL 1
@@ -1288,6 +1289,7 @@
 #define CONFIG_MSMPEG4V2_ENCODER 1
 #define CONFIG_MSMPEG4V3_ENCODER 1
 #define CONFIG_MSVIDEO1_ENCODER 1
+#define CONFIG_NVENC_ENCODER 0
 #define CONFIG_PAM_ENCODER 1
 #define CONFIG_PBM_ENCODER 1
 #define CONFIG_PCX_ENCODER 1
@@ -1577,6 +1579,7 @@
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
+#define CONFIG_USPP_FILTER 1
 #define CONFIG_VFLIP_FILTER 1
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0

SMP/ffmpeg.sln

@@ -86,7 +86,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffprobe", "ffprobe.vcxproj"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Programs", "Programs", "{8A736DDA-6840-4E65-9DA4-BF65A2A70428}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{9065B509-5108-45E4-AAF2-B5FD4EF9D9DF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pre-build (optional)", "pre-build (optional)", "{9065B509-5108-45E4-AAF2-B5FD4EF9D9DF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "project_generate", "project_generate\project_generate.vcxproj", "{FA1D2C31-D809-4021-9DE4-7552704175EE}"
 EndProject

SMP/libavfilter.vcxproj

@@ -376,6 +376,8 @@
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_unsharp.c">
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_uspp.c">
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vflip.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vignette.c">
@@ -418,6 +420,7 @@
     <ClCompile Include="..\libavfilter\libmpcodecs\vf_softpulldown.c">
     </ClCompile>
     <ClCompile Include="..\libavfilter\libmpcodecs\vf_uspp.c">
+      <ObjectFileName>$(IntDir)\libavfilter_libmpcodecs_vf_uspp.obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\libavfilter\avf_avectorscope.c">
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -503,6 +503,9 @@
     <ClCompile Include="..\libavfilter\vf_unsharp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_uspp.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vflip.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>