projects: Update for recent upstream merge.

SMP/config.asm

@@ -528,6 +528,7 @@
 %define CONFIG_SCHANNEL 0
 %define CONFIG_SDL 1
 %define CONFIG_SECURETRANSPORT 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
@@ -545,7 +546,7 @@
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_XVMC 0
 %define CONFIG_GPL 1
 %define CONFIG_NONFREE 1
@@ -1350,6 +1351,7 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
@@ -1532,12 +1534,14 @@
 %define CONFIG_LIBXVID_ENCODER 1
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 1
 %define CONFIG_NVENC_H264_ENCODER 1
 %define CONFIG_NVENC_HEVC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
+%define CONFIG_ABENCH_FILTER 1
 %define CONFIG_ACOMPRESSOR_FILTER 1
 %define CONFIG_ACROSSFADE_FILTER 1
 %define CONFIG_ADELAY_FILTER 1
@@ -1626,6 +1630,7 @@
 %define CONFIG_ALPHAMERGE_FILTER 1
 %define CONFIG_ATADENOISE_FILTER 1
 %define CONFIG_ASS_FILTER 1
+%define CONFIG_BENCH_FILTER 1
 %define CONFIG_BBOX_FILTER 1
 %define CONFIG_BLACKDETECT_FILTER 1
 %define CONFIG_BLACKFRAME_FILTER 1
@@ -2104,9 +2109,9 @@
 %define CONFIG_SRTP_PROTOCOL 1
 %define CONFIG_SUBFILE_PROTOCOL 1
 %define CONFIG_TCP_PROTOCOL 1
+%define CONFIG_TLS_GNUTLS_PROTOCOL 1
 %define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 %define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-%define CONFIG_TLS_GNUTLS_PROTOCOL 1
 %define CONFIG_TLS_OPENSSL_PROTOCOL 0
 %define CONFIG_UDP_PROTOCOL 1
 %define CONFIG_UDPLITE_PROTOCOL 1

SMP/config.h

@@ -570,6 +570,7 @@
 #define CONFIG_SCHANNEL 0
 #define CONFIG_SDL 1
 #define CONFIG_SECURETRANSPORT 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
@@ -595,7 +596,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_XVMC 0
 #define CONFIG_GPL 1
 #define CONFIG_NONFREE 1
@@ -1400,6 +1401,7 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
@@ -1582,12 +1584,14 @@
 #define CONFIG_LIBXVID_ENCODER 1
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 1
 #define CONFIG_NVENC_H264_ENCODER 1
 #define CONFIG_NVENC_HEVC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
+#define CONFIG_ABENCH_FILTER 1
 #define CONFIG_ACOMPRESSOR_FILTER 1
 #define CONFIG_ACROSSFADE_FILTER 1
 #define CONFIG_ADELAY_FILTER 1
@@ -1676,6 +1680,7 @@
 #define CONFIG_ALPHAMERGE_FILTER 1
 #define CONFIG_ATADENOISE_FILTER 1
 #define CONFIG_ASS_FILTER 1
+#define CONFIG_BENCH_FILTER 1
 #define CONFIG_BBOX_FILTER 1
 #define CONFIG_BLACKDETECT_FILTER 1
 #define CONFIG_BLACKFRAME_FILTER 1
@@ -2164,9 +2169,9 @@
 #define CONFIG_SRTP_PROTOCOL 1
 #define CONFIG_SUBFILE_PROTOCOL 1
 #define CONFIG_TCP_PROTOCOL 1
+#define CONFIG_TLS_GNUTLS_PROTOCOL 1
 #define CONFIG_TLS_SCHANNEL_PROTOCOL 0
 #define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0
-#define CONFIG_TLS_GNUTLS_PROTOCOL 1
 #define CONFIG_TLS_OPENSSL_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 1
 #define CONFIG_UDPLITE_PROTOCOL 1

SMP/libavcodec.vcxproj

@@ -103,7 +103,8 @@
     <YASM Include="..\libavcodec\x86\pixblockdsp.asm" />
     <YASM Include="..\libavcodec\x86\qpeldsp.asm" />
     <YASM Include="..\libavcodec\x86\rv34dsp.asm" />
-    <YASM Include="..\libavcodec\x86\vc1dsp.asm" />
+    <YASM Include="..\libavcodec\x86\vc1dsp_loopfilter.asm" />
+    <YASM Include="..\libavcodec\x86\vc1dsp_mc.asm" />
     <YASM Include="..\libavcodec\x86\simple_idct10.asm" />
     <YASM Include="..\libavcodec\x86\videodsp.asm" />
     <YASM Include="..\libavcodec\x86\vp3dsp.asm" />
@@ -298,9 +299,7 @@
     <ClCompile Include="..\libavcodec\texturedsp.c" />
     <ClCompile Include="..\libavcodec\texturedspenc.c" />
     <ClCompile Include="..\libavcodec\tpeldsp.c" />
-    <ClCompile Include="..\libavcodec\vc1dsp.c">
-      <ObjectFileName>$(IntDir)\libavcodec_vc1dsp.obj</ObjectFileName>
-    </ClCompile>
+    <ClCompile Include="..\libavcodec\vc1dsp.c" />
     <ClCompile Include="..\libavcodec\videodsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_videodsp.obj</ObjectFileName>
     </ClCompile>

SMP/libavcodec.vcxproj.filters

@@ -133,7 +133,10 @@
     <YASM Include="..\libavcodec\x86\rv34dsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
-    <YASM Include="..\libavcodec\x86\vc1dsp.asm">
+    <YASM Include="..\libavcodec\x86\vc1dsp_loopfilter.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
+    <YASM Include="..\libavcodec\x86\vc1dsp_mc.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
     <YASM Include="..\libavcodec\x86\simple_idct10.asm">

SMP/libavfilter.vcxproj

@@ -104,6 +104,7 @@
     <ClCompile Include="..\libavfilter\opencl_allkernels.c" />
     <ClCompile Include="..\libavfilter\transform.c" />
     <ClCompile Include="..\libavfilter\video.c" />
+    <ClCompile Include="..\libavfilter\f_bench.c" />
     <ClCompile Include="..\libavfilter\af_sidechaincompress.c" />
     <ClCompile Include="..\libavfilter\af_afade.c" />
     <ClCompile Include="..\libavfilter\af_adelay.c" />

SMP/libavfilter.vcxproj.filters

@@ -132,6 +132,9 @@
     <ClCompile Include="..\libavfilter\video.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_bench.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_sidechaincompress.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavformat.vcxproj

@@ -82,6 +82,7 @@
     <ClCompile Include="..\libavformat\options.c" />
     <ClCompile Include="..\libavformat\os_support.c" />
     <ClCompile Include="..\libavformat\qtpalette.c" />
+    <ClCompile Include="..\libavformat\protocols.c" />
     <ClCompile Include="..\libavformat\riff.c" />
     <ClCompile Include="..\libavformat\sdp.c" />
     <ClCompile Include="..\libavformat\url.c" />

SMP/libavformat.vcxproj.filters

@@ -67,6 +67,9 @@
     <ClCompile Include="..\libavformat\qtpalette.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\protocols.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\riff.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>