project: Update for recent upstream merge.

51be797b · Matt Oliver · 429a6669 · 51be797b · 51be797b · 51be797b
13 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -524,12 +524,12 @@
 %define CONFIG_AMF 0
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CRYSTALHD 0
-%define CONFIG_CUDA 1
-%define CONFIG_CUVID 1
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
 %define CONFIG_D3D11VA 1
 %define CONFIG_DXVA2 1
-%define CONFIG_NVDEC 1
-%define CONFIG_NVENC 1
+%define CONFIG_NVDEC 0
+%define CONFIG_NVENC 0
 %define CONFIG_VAAPI 0
 %define CONFIG_VDPAU 0
 %define CONFIG_VIDEOTOOLBOX 0
@@ -1186,19 +1186,19 @@
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
 %define CONFIG_LIBOPENH264_DECODER 0
-%define CONFIG_H264_CUVID_DECODER 1
-%define CONFIG_HEVC_CUVID_DECODER 1
+%define CONFIG_H264_CUVID_DECODER 0
+%define CONFIG_HEVC_CUVID_DECODER 0
 %define CONFIG_HEVC_MEDIACODEC_DECODER 0
-%define CONFIG_MJPEG_CUVID_DECODER 1
-%define CONFIG_MPEG1_CUVID_DECODER 1
-%define CONFIG_MPEG2_CUVID_DECODER 1
-%define CONFIG_MPEG4_CUVID_DECODER 1
+%define CONFIG_MJPEG_CUVID_DECODER 0
+%define CONFIG_MPEG1_CUVID_DECODER 0
+%define CONFIG_MPEG2_CUVID_DECODER 0
+%define CONFIG_MPEG4_CUVID_DECODER 0
 %define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-%define CONFIG_VC1_CUVID_DECODER 1
-%define CONFIG_VP8_CUVID_DECODER 1
+%define CONFIG_VC1_CUVID_DECODER 0
+%define CONFIG_VP8_CUVID_DECODER 0
 %define CONFIG_VP8_MEDIACODEC_DECODER 0
 %define CONFIG_VP8_QSV_DECODER 1
-%define CONFIG_VP9_CUVID_DECODER 1
+%define CONFIG_VP9_CUVID_DECODER 0
 %define CONFIG_VP9_MEDIACODEC_DECODER 0
 %define CONFIG_A64MULTI_ENCODER 1
 %define CONFIG_A64MULTI5_ENCODER 1
@@ -1386,17 +1386,17 @@
 %define CONFIG_H263_V4L2M2M_ENCODER 0
 %define CONFIG_LIBOPENH264_ENCODER 0
 %define CONFIG_H264_AMF_ENCODER 0
-%define CONFIG_H264_NVENC_ENCODER 1
+%define CONFIG_H264_NVENC_ENCODER 0
 %define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
 %define CONFIG_H264_V4L2M2M_ENCODER 0
 %define CONFIG_H264_VAAPI_ENCODER 0
 %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_NVENC_ENCODER 0
+%define CONFIG_NVENC_H264_ENCODER 0
+%define CONFIG_NVENC_HEVC_ENCODER 0
 %define CONFIG_HEVC_AMF_ENCODER 0
-%define CONFIG_HEVC_NVENC_ENCODER 1
+%define CONFIG_HEVC_NVENC_ENCODER 0
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_HEVC_V4L2M2M_ENCODER 0
 %define CONFIG_HEVC_VAAPI_ENCODER 0
@@ -1415,52 +1415,52 @@
 %define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_D3D11VA2_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
-%define CONFIG_H264_NVDEC_HWACCEL 1
+%define CONFIG_H264_NVDEC_HWACCEL 0
 %define CONFIG_H264_VAAPI_HWACCEL 0
 %define CONFIG_H264_VDPAU_HWACCEL 0
 %define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_D3D11VA2_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
-%define CONFIG_HEVC_NVDEC_HWACCEL 1
+%define CONFIG_HEVC_NVDEC_HWACCEL 0
 %define CONFIG_HEVC_VAAPI_HWACCEL 0
 %define CONFIG_HEVC_VDPAU_HWACCEL 0
 %define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_MJPEG_NVDEC_HWACCEL 1
+%define CONFIG_MJPEG_NVDEC_HWACCEL 0
 %define CONFIG_MJPEG_VAAPI_HWACCEL 0
-%define CONFIG_MPEG1_NVDEC_HWACCEL 1
+%define CONFIG_MPEG1_NVDEC_HWACCEL 0
 %define CONFIG_MPEG1_VDPAU_HWACCEL 0
 %define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG1_XVMC_HWACCEL 0
 %define CONFIG_MPEG2_D3D11VA_HWACCEL 1
 %define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
-%define CONFIG_MPEG2_NVDEC_HWACCEL 1
+%define CONFIG_MPEG2_NVDEC_HWACCEL 0
 %define CONFIG_MPEG2_DXVA2_HWACCEL 1
 %define CONFIG_MPEG2_VAAPI_HWACCEL 0
 %define CONFIG_MPEG2_VDPAU_HWACCEL 0
 %define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_MPEG2_XVMC_HWACCEL 0
-%define CONFIG_MPEG4_NVDEC_HWACCEL 1
+%define CONFIG_MPEG4_NVDEC_HWACCEL 0
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 %define CONFIG_VC1_D3D11VA_HWACCEL 1
 %define CONFIG_VC1_D3D11VA2_HWACCEL 1
 %define CONFIG_VC1_DXVA2_HWACCEL 1
-%define CONFIG_VC1_NVDEC_HWACCEL 1
+%define CONFIG_VC1_NVDEC_HWACCEL 0
 %define CONFIG_VC1_VAAPI_HWACCEL 0
 %define CONFIG_VC1_VDPAU_HWACCEL 0
-%define CONFIG_VP8_NVDEC_HWACCEL 1
+%define CONFIG_VP8_NVDEC_HWACCEL 0
 %define CONFIG_VP8_VAAPI_HWACCEL 0
 %define CONFIG_VP9_D3D11VA_HWACCEL 1
 %define CONFIG_VP9_D3D11VA2_HWACCEL 1
 %define CONFIG_VP9_DXVA2_HWACCEL 1
-%define CONFIG_VP9_NVDEC_HWACCEL 1
+%define CONFIG_VP9_NVDEC_HWACCEL 0
 %define CONFIG_VP9_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_D3D11VA_HWACCEL 1
 %define CONFIG_WMV3_D3D11VA2_HWACCEL 1
 %define CONFIG_WMV3_DXVA2_HWACCEL 1
-%define CONFIG_WMV3_NVDEC_HWACCEL 1
+%define CONFIG_WMV3_NVDEC_HWACCEL 0
 %define CONFIG_WMV3_VAAPI_HWACCEL 0
 %define CONFIG_WMV3_VDPAU_HWACCEL 0
 %define CONFIG_AAC_PARSER 1
@@ -1726,7 +1726,7 @@
 %define CONFIG_HWDOWNLOAD_FILTER 1
 %define CONFIG_HWMAP_FILTER 1
 %define CONFIG_HWUPLOAD_FILTER 1
-%define CONFIG_HWUPLOAD_CUDA_FILTER 1
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HYSTERESIS_FILTER 1
 %define CONFIG_IDET_FILTER 1
 %define CONFIG_IL_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -574,8 +574,8 @@
 #define CONFIG_AMF 0
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CRYSTALHD 0
-#define CONFIG_CUDA 1
-#define CONFIG_CUVID 1
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
 #ifdef _WIN32
 #include <sdkddkver.h>
 #endif
@@ -585,8 +585,8 @@
 #   define CONFIG_D3D11VA 0
 #endif
 #define CONFIG_DXVA2 1
-#define CONFIG_NVDEC 1
-#define CONFIG_NVENC 1
+#define CONFIG_NVDEC 0
+#define CONFIG_NVENC 0
 #define CONFIG_VAAPI 0
 #define CONFIG_VDPAU 0
 #define CONFIG_VIDEOTOOLBOX 0
@@ -1251,19 +1251,19 @@
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
 #define CONFIG_LIBOPENH264_DECODER 0
-#define CONFIG_H264_CUVID_DECODER 1
-#define CONFIG_HEVC_CUVID_DECODER 1
+#define CONFIG_H264_CUVID_DECODER 0
+#define CONFIG_HEVC_CUVID_DECODER 0
 #define CONFIG_HEVC_MEDIACODEC_DECODER 0
-#define CONFIG_MJPEG_CUVID_DECODER 1
-#define CONFIG_MPEG1_CUVID_DECODER 1
-#define CONFIG_MPEG2_CUVID_DECODER 1
-#define CONFIG_MPEG4_CUVID_DECODER 1
+#define CONFIG_MJPEG_CUVID_DECODER 0
+#define CONFIG_MPEG1_CUVID_DECODER 0
+#define CONFIG_MPEG2_CUVID_DECODER 0
+#define CONFIG_MPEG4_CUVID_DECODER 0
 #define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-#define CONFIG_VC1_CUVID_DECODER 1
-#define CONFIG_VP8_CUVID_DECODER 1
+#define CONFIG_VC1_CUVID_DECODER 0
+#define CONFIG_VP8_CUVID_DECODER 0
 #define CONFIG_VP8_MEDIACODEC_DECODER 0
 #define CONFIG_VP8_QSV_DECODER 1
-#define CONFIG_VP9_CUVID_DECODER 1
+#define CONFIG_VP9_CUVID_DECODER 0
 #define CONFIG_VP9_MEDIACODEC_DECODER 0
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
@@ -1451,17 +1451,17 @@
 #define CONFIG_H263_V4L2M2M_ENCODER 0
 #define CONFIG_LIBOPENH264_ENCODER 0
 #define CONFIG_H264_AMF_ENCODER 0
-#define CONFIG_H264_NVENC_ENCODER 1
+#define CONFIG_H264_NVENC_ENCODER 0
 #define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
 #define CONFIG_H264_V4L2M2M_ENCODER 0
 #define CONFIG_H264_VAAPI_ENCODER 0
 #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_NVENC_ENCODER 0
+#define CONFIG_NVENC_H264_ENCODER 0
+#define CONFIG_NVENC_HEVC_ENCODER 0
 #define CONFIG_HEVC_AMF_ENCODER 0
-#define CONFIG_HEVC_NVENC_ENCODER 1
+#define CONFIG_HEVC_NVENC_ENCODER 0
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_HEVC_V4L2M2M_ENCODER 0
 #define CONFIG_HEVC_VAAPI_ENCODER 0
@@ -1480,42 +1480,42 @@
 #define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_H264_DXVA2_HWACCEL 1
-#define CONFIG_H264_NVDEC_HWACCEL 1
+#define CONFIG_H264_NVDEC_HWACCEL 0
 #define CONFIG_H264_VAAPI_HWACCEL 0
 #define CONFIG_H264_VDPAU_HWACCEL 0
 #define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
-#define CONFIG_HEVC_NVDEC_HWACCEL 1
+#define CONFIG_HEVC_NVDEC_HWACCEL 0
 #define CONFIG_HEVC_VAAPI_HWACCEL 0
 #define CONFIG_HEVC_VDPAU_HWACCEL 0
 #define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_MJPEG_NVDEC_HWACCEL 1
+#define CONFIG_MJPEG_NVDEC_HWACCEL 0
 #define CONFIG_MJPEG_VAAPI_HWACCEL 0
-#define CONFIG_MPEG1_NVDEC_HWACCEL 1
+#define CONFIG_MPEG1_NVDEC_HWACCEL 0
 #define CONFIG_MPEG1_VDPAU_HWACCEL 0
 #define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG1_XVMC_HWACCEL 0
 #define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_MPEG2_NVDEC_HWACCEL 1
+#define CONFIG_MPEG2_NVDEC_HWACCEL 0
 #define CONFIG_MPEG2_DXVA2_HWACCEL 1
 #define CONFIG_MPEG2_VAAPI_HWACCEL 0
 #define CONFIG_MPEG2_VDPAU_HWACCEL 0
 #define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_MPEG2_XVMC_HWACCEL 0
-#define CONFIG_MPEG4_NVDEC_HWACCEL 1
+#define CONFIG_MPEG4_NVDEC_HWACCEL 0
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
 #define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_VC1_DXVA2_HWACCEL 1
-#define CONFIG_VC1_NVDEC_HWACCEL 1
+#define CONFIG_VC1_NVDEC_HWACCEL 0
 #define CONFIG_VC1_VAAPI_HWACCEL 0
 #define CONFIG_VC1_VDPAU_HWACCEL 0
-#define CONFIG_VP8_NVDEC_HWACCEL 1
+#define CONFIG_VP8_NVDEC_HWACCEL 0
 #define CONFIG_VP8_VAAPI_HWACCEL 0
 #ifdef _WIN32
 #include <sdkddkver.h>
@@ -1541,12 +1541,12 @@
 #else
 #   define CONFIG_VP9_DXVA2_HWACCEL 0
 #endif
-#define CONFIG_VP9_NVDEC_HWACCEL 1
+#define CONFIG_VP9_NVDEC_HWACCEL 0
 #define CONFIG_VP9_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
 #define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
 #define CONFIG_WMV3_DXVA2_HWACCEL 1
-#define CONFIG_WMV3_NVDEC_HWACCEL 1
+#define CONFIG_WMV3_NVDEC_HWACCEL 0
 #define CONFIG_WMV3_VAAPI_HWACCEL 0
 #define CONFIG_WMV3_VDPAU_HWACCEL 0
 #define CONFIG_AAC_PARSER 1
@@ -1812,7 +1812,7 @@
 #define CONFIG_HWDOWNLOAD_FILTER 1
 #define CONFIG_HWMAP_FILTER 1
 #define CONFIG_HWUPLOAD_FILTER 1
-#define CONFIG_HWUPLOAD_CUDA_FILTER 1
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HYSTERESIS_FILTER 1
 #define CONFIG_IDET_FILTER 1
 #define CONFIG_IL_FILTER 1

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -38,7 +38,6 @@
    <ClCompile Include="..\fftools\ffmpeg_opt.c" />
    <ClCompile Include="..\fftools\ffmpeg_filter.c" />
    <ClCompile Include="..\fftools\ffmpeg_hw.c" />
-    <ClCompile Include="..\fftools\ffmpeg_cuvid.c" />
    <ClCompile Include="..\fftools\ffmpeg_qsv.c" />
    <ClCompile Include="..\fftools\cmdutils.c" />
    <ClCompile Include="..\fftools\ffmpeg.c" />

--- a/SMP/ffmpeg.vcxproj.filters
+++ b/SMP/ffmpeg.vcxproj.filters
@@ -30,9 +30,6 @@
    <ClCompile Include="..\fftools\ffmpeg_hw.c">
      <Filter>Source Files\fftools</Filter>
    </ClCompile>
-    <ClCompile Include="..\fftools\ffmpeg_cuvid.c">
-      <Filter>Source Files\fftools</Filter>
-    </ClCompile>
    <ClCompile Include="..\fftools\ffmpeg_qsv.c">
      <Filter>Source Files\fftools</Filter>
    </ClCompile>

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -265,7 +265,6 @@
    <ClCompile Include="..\libavcodec\motion_est.c" />
    <ClCompile Include="..\libavcodec\ratecontrol.c" />
    <ClCompile Include="..\libavcodec\mss34dsp.c" />
-    <ClCompile Include="..\libavcodec\nvenc.c" />
    <ClCompile Include="..\libavcodec\qsv.c" />
    <ClCompile Include="..\libavcodec\qsvdec.c" />
    <ClCompile Include="..\libavcodec\qsvenc.c" />
@@ -516,8 +515,6 @@
    <ClCompile Include="..\libavcodec\h264_sei.c" />
    <ClCompile Include="..\libavcodec\h264_slice.c" />
    <ClCompile Include="..\libavcodec\h264data.c" />
-    <ClCompile Include="..\libavcodec\cuviddec.c" />
-    <ClCompile Include="..\libavcodec\nvenc_h264.c" />
    <ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
    <ClCompile Include="..\libavcodec\qsvenc_h264.c" />
    <ClCompile Include="..\libavcodec\hapdec.c" />
@@ -529,7 +526,6 @@
    <ClCompile Include="..\libavcodec\hevcpred.c" />
    <ClCompile Include="..\libavcodec\hevcdsp.c" />
    <ClCompile Include="..\libavcodec\hevc_filter.c" />
-    <ClCompile Include="..\libavcodec\nvenc_hevc.c" />
    <ClCompile Include="..\libavcodec\qsvenc_hevc.c" />
    <ClCompile Include="..\libavcodec\hevc_ps_enc.c" />
    <ClCompile Include="..\libavcodec\hnm4video.c" />
@@ -842,19 +838,10 @@
    <ClCompile Include="..\libavcodec\adpcmenc.c" />
    <ClCompile Include="..\libavcodec\vima.c" />
    <ClCompile Include="..\libavcodec\dxva2.c" />
-    <ClCompile Include="..\libavcodec\nvdec.c" />
    <ClCompile Include="..\libavcodec\dxva2_h264.c" />
-    <ClCompile Include="..\libavcodec\nvdec_h264.c" />
    <ClCompile Include="..\libavcodec\dxva2_hevc.c" />
-    <ClCompile Include="..\libavcodec\nvdec_hevc.c" />
-    <ClCompile Include="..\libavcodec\nvdec_mjpeg.c" />
-    <ClCompile Include="..\libavcodec\nvdec_mpeg12.c" />
    <ClCompile Include="..\libavcodec\dxva2_mpeg2.c" />
-    <ClCompile Include="..\libavcodec\nvdec_mpeg4.c" />
    <ClCompile Include="..\libavcodec\dxva2_vc1.c" />
-    <ClCompile Include="..\libavcodec\nvdec_vc1.c" />
-    <ClCompile Include="..\libavcodec\nvdec_vp8.c" />
-    <ClCompile Include="..\libavcodec\nvdec_vp9.c" />
    <ClCompile Include="..\libavcodec\libilbc.c" />
    <ClCompile Include="..\libavcodec\libmp3lame.c" />
    <ClCompile Include="..\libavcodec\libopusdec.c" />

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -618,9 +618,6 @@
    <ClCompile Include="..\libavcodec\mss34dsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\qsv.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1371,12 +1368,6 @@
    <ClCompile Include="..\libavcodec\h264data.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\cuviddec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc_h264.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1410,9 +1401,6 @@
    <ClCompile Include="..\libavcodec\hevc_filter.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc_hevc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\qsvenc_hevc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2349,45 +2337,18 @@
    <ClCompile Include="..\libavcodec\dxva2.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\dxva2_h264.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_h264.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\dxva2_hevc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_hevc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_mjpeg.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_mpeg12.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\dxva2_mpeg2.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_mpeg4.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\dxva2_vc1.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_vc1.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_vp8.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvdec_vp9.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\libilbc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavcodec/codec_list.c
+++ b/SMP/libavcodec/codec_list.c
@@ -182,12 +182,7 @@ static const AVCodec *codec_list[] = {
    &ff_libx264rgb_encoder,
    &ff_libx265_encoder,
    &ff_libxvid_encoder,
-    &ff_h264_nvenc_encoder,
    &ff_h264_qsv_encoder,
-    &ff_nvenc_encoder,
-    &ff_nvenc_h264_encoder,
-    &ff_nvenc_hevc_encoder,
-    &ff_hevc_nvenc_encoder,
    &ff_hevc_qsv_encoder,
    &ff_mjpeg_qsv_encoder,
    &ff_mpeg2_qsv_encoder,
@@ -623,14 +618,5 @@ static const AVCodec *codec_list[] = {
    &ff_bintext_decoder,
    &ff_xbin_decoder,
    &ff_idf_decoder,
-    &ff_h264_cuvid_decoder,
-    &ff_hevc_cuvid_decoder,
-    &ff_mjpeg_cuvid_decoder,
-    &ff_mpeg1_cuvid_decoder,
-    &ff_mpeg2_cuvid_decoder,
-    &ff_mpeg4_cuvid_decoder,
-    &ff_vc1_cuvid_decoder,
-    &ff_vp8_cuvid_decoder,
    &ff_vp8_qsv_decoder,
-    &ff_vp9_cuvid_decoder,
    NULL };
\ No newline at end of file
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -268,7 +268,6 @@
    <ClCompile Include="..\libavfilter\vf_hue.c" />
    <ClCompile Include="..\libavfilter\vf_hwdownload.c" />
    <ClCompile Include="..\libavfilter\vf_hwmap.c" />
-    <ClCompile Include="..\libavfilter\vf_hwupload_cuda.c" />
    <ClCompile Include="..\libavfilter\vf_hwupload.c" />
    <ClCompile Include="..\libavfilter\vf_hysteresis.c" />
    <ClCompile Include="..\libavfilter\vf_il.c" />

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -627,9 +627,6 @@
    <ClCompile Include="..\libavfilter\vf_hwmap.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_hwupload_cuda.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_hwupload.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>

--- a/SMP/libavfilter/dce_defs.c
+++ b/SMP/libavfilter/dce_defs.c
@@ -185,6 +185,7 @@ const AVFilter ff_vf_coreimage = {0};
 const AVFilter ff_vf_deinterlace_vaapi = {0};
 const AVFilter ff_vf_denoise_vaapi = {0};
 const AVFilter ff_vf_frei0r = {0};
+const AVFilter ff_vf_hwupload_cuda = {0};
 const AVFilter ff_vf_libvmaf = {0};
 const AVFilter ff_vf_ocr = {0};
 const AVFilter ff_vf_ocv = {0};

--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -173,6 +173,7 @@ EXPORTS
    av_frame_make_writable
    av_frame_move_ref
    av_frame_new_side_data
+    av_frame_new_side_data_from_buf
    av_frame_ref
    av_frame_remove_side_data
    av_frame_set_best_effort_timestamp

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
@@ -139,7 +139,6 @@
    <ClCompile Include="..\libavutil\xga_font_data.c" />
    <ClCompile Include="..\libavutil\xtea.c" />
    <ClCompile Include="..\libavutil\tea.c" />
-    <ClCompile Include="..\libavutil\hwcontext_cuda.c" />
    <ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
    <ClCompile Include="..\libavutil\hwcontext_qsv.c" />
    <ClCompile Include="..\libavutil\lzo.c" />

--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -246,9 +246,6 @@
    <ClCompile Include="..\libavutil\tea.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavutil\hwcontext_cuda.c">
-      <Filter>Source Files\libavutil</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavutil\hwcontext_dxva2.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>