projects: Update for upstream merge.

SMP/config.asm

@@ -548,6 +548,7 @@
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
 %define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
 %define CONFIG_LIBMFX 1
 %define CONFIG_MMAL 0
 %define CONFIG_NVENC 1
@@ -857,6 +858,7 @@
 %define CONFIG_SDX2_DPCM_DECODER 1
 %define CONFIG_SGI_DECODER 1
 %define CONFIG_SGIRLE_DECODER 1
+%define CONFIG_SHEERVIDEO_DECODER 1
 %define CONFIG_SMACKER_DECODER 1
 %define CONFIG_SMC_DECODER 1
 %define CONFIG_SMVJPEG_DECODER 1
@@ -1139,6 +1141,11 @@
 %define CONFIG_BINTEXT_DECODER 1
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_AA_DEMUXER 1
 %define CONFIG_AAC_DEMUXER 1
 %define CONFIG_AC3_DEMUXER 1
@@ -1883,6 +1890,7 @@
 %define CONFIG_MOVIE_FILTER 1
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1892,6 +1900,7 @@
 %define CONFIG_H264_VDA_OLD_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
 %define CONFIG_HEVC_QSV_HWACCEL 1
@@ -1912,12 +1921,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
 %define CONFIG_VC1_MMAL_HWACCEL 0
 %define CONFIG_VC1_QSV_HWACCEL 1
+%define CONFIG_VP8_CUVID_HWACCEL 0
+%define CONFIG_VP9_CUVID_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 1
 %define CONFIG_VP9_DXVA2_HWACCEL 1
 %define CONFIG_VP9_VAAPI_HWACCEL 0

SMP/config.h

@@ -598,6 +598,7 @@
 #endif
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
 #define CONFIG_LIBMFX 1
 #define CONFIG_MMAL 0
 #define CONFIG_NVENC 1
@@ -907,6 +908,7 @@
 #define CONFIG_SDX2_DPCM_DECODER 1
 #define CONFIG_SGI_DECODER 1
 #define CONFIG_SGIRLE_DECODER 1
+#define CONFIG_SHEERVIDEO_DECODER 1
 #define CONFIG_SMACKER_DECODER 1
 #define CONFIG_SMC_DECODER 1
 #define CONFIG_SMVJPEG_DECODER 1
@@ -1189,6 +1191,11 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_AA_DEMUXER 1
 #define CONFIG_AAC_DEMUXER 1
 #define CONFIG_AC3_DEMUXER 1
@@ -1933,6 +1940,7 @@
 #define CONFIG_MOVIE_FILTER 1
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 1
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1942,6 +1950,7 @@
 #define CONFIG_H264_VDA_OLD_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 1
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_QSV_HWACCEL 1
@@ -1962,12 +1971,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL 1
 #define CONFIG_VC1_DXVA2_HWACCEL 1
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
 #define CONFIG_VC1_MMAL_HWACCEL 0
 #define CONFIG_VC1_QSV_HWACCEL 1
+#define CONFIG_VP8_CUVID_HWACCEL 0
+#define CONFIG_VP9_CUVID_HWACCEL 0
 #include <sdkddkver.h>
 #if defined(NTDDI_WIN10_TH2)
 #   define CONFIG_VP9_D3D11VA_HWACCEL 1

SMP/libavcodec.vcxproj

@@ -738,6 +738,7 @@
     <ClCompile Include="..\libavcodec\sgienc.c" />
     <ClCompile Include="..\libavcodec\rle.c" />
     <ClCompile Include="..\libavcodec\sgirledec.c" />
+    <ClCompile Include="..\libavcodec\sheervideo.c" />
     <ClCompile Include="..\libavcodec\shorten.c" />
     <ClCompile Include="..\libavcodec\sipr.c" />
     <ClCompile Include="..\libavcodec\sipr16k.c" />

SMP/libavcodec.vcxproj.filters

@@ -1836,6 +1836,9 @@
     <ClCompile Include="..\libavcodec\sgirledec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\sheervideo.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\shorten.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

SMP/libavfilter.vcxproj

@@ -82,6 +82,7 @@
     <YASM Include="..\libavfilter\x86\vf_psnr.asm" />
     <YASM Include="..\libavfilter\x86\vf_pullup.asm" />
     <YASM Include="..\libavfilter\x86\vf_removegrain.asm" />
+    <YASM Include="..\libavfilter\x86\avf_showcqt.asm" />
     <YASM Include="..\libavfilter\x86\vf_ssim.asm" />
     <YASM Include="..\libavfilter\x86\vf_stereo3d.asm" />
     <YASM Include="..\libavfilter\x86\af_volume.asm" />
@@ -359,7 +360,9 @@
     <ClCompile Include="..\libavfilter\avf_aphasemeter.c" />
     <ClCompile Include="..\libavfilter\avf_avectorscope.c" />
     <ClCompile Include="..\libavfilter\avf_concat.c" />
-    <ClCompile Include="..\libavfilter\avf_showcqt.c" />
+    <ClCompile Include="..\libavfilter\avf_showcqt.c">
+      <ObjectFileName>$(IntDir)\libavfilter_avf_showcqt.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\avf_showfreqs.c" />
     <ClCompile Include="..\libavfilter\avf_showspectrum.c" />
     <ClCompile Include="..\libavfilter\avf_showvolume.c" />
@@ -385,6 +388,7 @@
     <ClCompile Include="..\libavfilter\x86\vf_psnr_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_pullup_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_removegrain_init.c" />
+    <ClCompile Include="..\libavfilter\x86\avf_showcqt_init.c" />
     <ClCompile Include="..\libavfilter\x86\vf_spp.c">
       <ObjectFileName>$(IntDir)\libavfilter_x86_vf_spp.obj</ObjectFileName>
     </ClCompile>

SMP/libavfilter.vcxproj.filters

@@ -70,6 +70,9 @@
     <YASM Include="..\libavfilter\x86\vf_removegrain.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
+    <YASM Include="..\libavfilter\x86\avf_showcqt.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
     <YASM Include="..\libavfilter\x86\vf_ssim.asm">
       <Filter>Source Files\libavfilter\x86</Filter>
     </YASM>
@@ -855,6 +858,9 @@
     <ClCompile Include="..\libavfilter\x86\vf_removegrain_init.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\x86\avf_showcqt_init.c">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\x86\vf_spp.c">
       <Filter>Source Files\libavfilter\x86</Filter>
     </ClCompile>