projects: Update for recent upstream merge.

The projects were also changed to be built with the gpl compliant settings instead on using non-free.

projects: Update for recent upstream merge.
The projects were also changed to be built with the gpl compliant settings instead on using non-free.
45dfe93e · Matt Oliver · 79e39fc3 · 45dfe93e · 45dfe93e · 45dfe93e
19 changed file
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -406,6 +406,7 @@
 %define HAVE_LIBDC1394_2 0
 %define HAVE_MAKEINFO 0
 %define HAVE_MAKEINFO_HTML 0
+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 %define HAVE_PERL 0
 %define HAVE_POD2MAN 0
 %define HAVE_SDL 1
@@ -449,7 +450,6 @@
 %define CONFIG_SCALING_VIDEO_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
-%define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_AVISYNTH 1
 %define CONFIG_BZLIB 1
 %define CONFIG_CHROMAPRINT 0
@@ -471,7 +471,7 @@
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBEBUR128 0
 %define CONFIG_LIBFAAC 0
-%define CONFIG_LIBFDK_AAC 1
+%define CONFIG_LIBFDK_AAC 0
 %define CONFIG_LIBFLITE 0
 %define CONFIG_LIBFONTCONFIG 1
 %define CONFIG_LIBFREETYPE 1
@@ -484,7 +484,6 @@
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
 %define CONFIG_LIBNUT 0
-%define CONFIG_LIBNPP 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
 %define CONFIG_LIBOPENCV 0
@@ -504,7 +503,6 @@
 %define CONFIG_LIBTESSERACT 0
 %define CONFIG_LIBTHEORA 1
 %define CONFIG_LIBTWOLAME 0
-%define CONFIG_LIBUTVIDEO 0
 %define CONFIG_LIBV4L2 0
 %define CONFIG_LIBVIDSTAB 0
 %define CONFIG_LIBVO_AMRWBENC 0
@@ -537,6 +535,21 @@
 %define CONFIG_X11GRAB 0
 %define CONFIG_XLIB 0
 %define CONFIG_ZLIB 1
+%define CONFIG_AUDIOTOOLBOX 0
+%define CONFIG_CUDA 0
+%define CONFIG_CUVID 0
+%define CONFIG_D3D11VA 1
+%define CONFIG_DXVA2 1
+%define CONFIG_LIBMFX 1
+%define CONFIG_LIBNPP 0
+%define CONFIG_MMAL 0
+%define CONFIG_NVENC 1
+%define CONFIG_OMX 0
+%define CONFIG_VAAPI 0
+%define CONFIG_VDA 0
+%define CONFIG_VDPAU 0
+%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_XVMC 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
@@ -547,21 +560,8 @@
 %define CONFIG_SMALL 0
 %define CONFIG_STATIC 1
 %define CONFIG_SWSCALE_ALPHA 1
-%define CONFIG_CUDA 1
-%define CONFIG_CUVID 1
-%define CONFIG_LIBMFX 1
-%define CONFIG_MMAL 0
-%define CONFIG_NVENC 1
-%define CONFIG_OMX 0
-%define CONFIG_D3D11VA 1
-%define CONFIG_DXVA2 1
-%define CONFIG_VAAPI 0
-%define CONFIG_VDA 0
-%define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_XVMC 0
 %define CONFIG_GPL 1
-%define CONFIG_NONFREE 1
+%define CONFIG_NONFREE 0
 %define CONFIG_VERSION3 1
 %define CONFIG_AVCODEC 1
 %define CONFIG_AVDEVICE 1
@@ -923,6 +923,7 @@
 %define CONFIG_XL_DECODER 1
 %define CONFIG_XWD_DECODER 1
 %define CONFIG_Y41P_DECODER 1
+%define CONFIG_YLC_DECODER 1
 %define CONFIG_YOP_DECODER 1
 %define CONFIG_YUV4_DECODER 1
 %define CONFIG_ZERO12V_DECODER 1
@@ -1123,7 +1124,7 @@
 %define CONFIG_QDMC_AT_DECODER 0
 %define CONFIG_QDM2_AT_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
-%define CONFIG_LIBFDK_AAC_DECODER 1
+%define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
 %define CONFIG_LIBGSM_MS_DECODER 0
 %define CONFIG_LIBILBC_DECODER 1
@@ -1133,7 +1134,6 @@
 %define CONFIG_LIBOPUS_DECODER 0
 %define CONFIG_LIBSCHROEDINGER_DECODER 0
 %define CONFIG_LIBSPEEX_DECODER 1
-%define CONFIG_LIBUTVIDEO_DECODER 0
 %define CONFIG_LIBVORBIS_DECODER 1
 %define CONFIG_LIBVPX_VP8_DECODER 0
 %define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1141,11 +1141,11 @@
 %define CONFIG_BINTEXT_DECODER 1
 %define CONFIG_XBIN_DECODER 1
 %define CONFIG_IDF_DECODER 1
-%define CONFIG_H264_CUVID_DECODER 1
-%define CONFIG_HEVC_CUVID_DECODER 1
-%define CONFIG_VC1_CUVID_DECODER 1
-%define CONFIG_VP8_CUVID_DECODER 1
-%define CONFIG_VP9_CUVID_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
@@ -1399,9 +1399,14 @@
 %define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
@@ -1558,7 +1563,7 @@
 %define CONFIG_PCM_ALAW_AT_ENCODER 0
 %define CONFIG_PCM_MULAW_AT_ENCODER 0
 %define CONFIG_LIBFAAC_ENCODER 0
-%define CONFIG_LIBFDK_AAC_ENCODER 1
+%define CONFIG_LIBFDK_AAC_ENCODER 0
 %define CONFIG_LIBGSM_ENCODER 0
 %define CONFIG_LIBGSM_MS_ENCODER 0
 %define CONFIG_LIBILBC_ENCODER 1
@@ -1571,7 +1576,6 @@
 %define CONFIG_LIBSPEEX_ENCODER 1
 %define CONFIG_LIBTHEORA_ENCODER 1
 %define CONFIG_LIBTWOLAME_ENCODER 0
-%define CONFIG_LIBUTVIDEO_ENCODER 0
 %define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 %define CONFIG_LIBVORBIS_ENCODER 1
 %define CONFIG_LIBVPX_VP8_ENCODER 1
@@ -1586,13 +1590,15 @@
 %define CONFIG_LIBXAVS_ENCODER 0
 %define CONFIG_LIBXVID_ENCODER 1
 %define CONFIG_LIBOPENH264_ENCODER 0
+%define CONFIG_H264_NVENC_ENCODER 1
+%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_H264_QSV_ENCODER 1
 %define CONFIG_H264_VAAPI_ENCODER 0
 %define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 %define CONFIG_NVENC_ENCODER 1
-%define CONFIG_H264_OMX_ENCODER 0
 %define CONFIG_NVENC_H264_ENCODER 1
 %define CONFIG_NVENC_HEVC_ENCODER 1
+%define CONFIG_HEVC_NVENC_ENCODER 1
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_HEVC_VAAPI_ENCODER 0
 %define CONFIG_LIBKVAZAAR_ENCODER 0
@@ -1756,7 +1762,7 @@
 %define CONFIG_HQX_FILTER 1
 %define CONFIG_HWDOWNLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_FILTER 1
-%define CONFIG_HWUPLOAD_CUDA_FILTER 1
+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
 %define CONFIG_HSTACK_FILTER 1
 %define CONFIG_HUE_FILTER 1
 %define CONFIG_IDET_FILTER 1
@@ -1890,7 +1896,7 @@
 %define CONFIG_MOVIE_FILTER 1
 %define CONFIG_H263_VAAPI_HWACCEL 0
 %define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_H264_CUVID_HWACCEL 1
+%define CONFIG_H264_CUVID_HWACCEL 0
 %define CONFIG_H264_D3D11VA_HWACCEL 1
 %define CONFIG_H264_DXVA2_HWACCEL 1
 %define CONFIG_H264_MMAL_HWACCEL 0
@@ -1900,7 +1906,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 1
+%define CONFIG_HEVC_CUVID_HWACCEL 0
 %define CONFIG_HEVC_D3D11VA_HWACCEL 1
 %define CONFIG_HEVC_DXVA2_HWACCEL 1
 %define CONFIG_HEVC_QSV_HWACCEL 1
@@ -1921,15 +1927,15 @@
 %define CONFIG_MPEG4_VAAPI_HWACCEL 0
 %define CONFIG_MPEG4_VDPAU_HWACCEL 0
 %define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_VC1_CUVID_HWACCEL 1
+%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 1
-%define CONFIG_VP9_CUVID_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

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -21,8 +21,8 @@

 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-nonfree --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libfdk-aac --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --enable-cuda --enable-cuvid --toolchain=msvc"
-#define FFMPEG_LICENSE "nonfree and unredistributable"
+#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-avisynth --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-nvenc --enable-libmfx --toolchain=msvc"
+#define FFMPEG_LICENSE "GPL version 3 or later"
 #define CONFIG_THIS_YEAR 2016
 #define FFMPEG_DATADIR "."
 #define AVCONV_DATADIR "."
@@ -448,6 +448,7 @@
 #define HAVE_LIBDC1394_2 0
 #define HAVE_MAKEINFO 0
 #define HAVE_MAKEINFO_HTML 0
+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
 #define HAVE_PERL 0
 #define HAVE_POD2MAN 0
 #define HAVE_SDL 1
@@ -491,7 +492,6 @@
 #define CONFIG_SCALING_VIDEO_EXAMPLE 0
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
-#define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_AVISYNTH 1
 #define CONFIG_BZLIB 1
 #define CONFIG_CHROMAPRINT 0
@@ -513,7 +513,7 @@
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBEBUR128 0
 #define CONFIG_LIBFAAC 0
-#define CONFIG_LIBFDK_AAC 1
+#define CONFIG_LIBFDK_AAC 0
 #define CONFIG_LIBFLITE 0
 #define CONFIG_LIBFONTCONFIG 1
 #define CONFIG_LIBFREETYPE 1
@@ -526,7 +526,6 @@
 #define CONFIG_LIBMODPLUG 1
 #define CONFIG_LIBMP3LAME 1
 #define CONFIG_LIBNUT 0
-#define CONFIG_LIBNPP 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
 #define CONFIG_LIBOPENCV 0
@@ -546,7 +545,6 @@
 #define CONFIG_LIBTESSERACT 0
 #define CONFIG_LIBTHEORA 1
 #define CONFIG_LIBTWOLAME 0
-#define CONFIG_LIBUTVIDEO 0
 #define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVIDSTAB 0
 #define CONFIG_LIBVO_AMRWBENC 0
@@ -579,6 +577,21 @@
 #define CONFIG_X11GRAB 0
 #define CONFIG_XLIB 0
 #define CONFIG_ZLIB 1
+#define CONFIG_AUDIOTOOLBOX 0
+#define CONFIG_CUDA 0
+#define CONFIG_CUVID 0
+#define CONFIG_D3D11VA 1
+#define CONFIG_DXVA2 1
+#define CONFIG_LIBMFX 1
+#define CONFIG_LIBNPP 0
+#define CONFIG_MMAL 0
+#define CONFIG_NVENC 1
+#define CONFIG_OMX 0
+#define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_XVMC 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
@@ -597,21 +610,8 @@
 #   define CONFIG_STATIC 1
 #endif
 #define CONFIG_SWSCALE_ALPHA 1
-#define CONFIG_CUDA 1
-#define CONFIG_CUVID 1
-#define CONFIG_LIBMFX 1
-#define CONFIG_MMAL 0
-#define CONFIG_NVENC 1
-#define CONFIG_OMX 0
-#define CONFIG_D3D11VA 1
-#define CONFIG_DXVA2 1
-#define CONFIG_VAAPI 0
-#define CONFIG_VDA 0
-#define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_XVMC 0
 #define CONFIG_GPL 1
-#define CONFIG_NONFREE 1
+#define CONFIG_NONFREE 0
 #define CONFIG_VERSION3 1
 #define CONFIG_AVCODEC 1
 #define CONFIG_AVDEVICE 1
@@ -973,6 +973,7 @@
 #define CONFIG_XL_DECODER 1
 #define CONFIG_XWD_DECODER 1
 #define CONFIG_Y41P_DECODER 1
+#define CONFIG_YLC_DECODER 1
 #define CONFIG_YOP_DECODER 1
 #define CONFIG_YUV4_DECODER 1
 #define CONFIG_ZERO12V_DECODER 1
@@ -1173,7 +1174,7 @@
 #define CONFIG_QDMC_AT_DECODER 0
 #define CONFIG_QDM2_AT_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
-#define CONFIG_LIBFDK_AAC_DECODER 1
+#define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
 #define CONFIG_LIBGSM_MS_DECODER 0
 #define CONFIG_LIBILBC_DECODER 1
@@ -1183,7 +1184,6 @@
 #define CONFIG_LIBOPUS_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 1
-#define CONFIG_LIBUTVIDEO_DECODER 0
 #define CONFIG_LIBVORBIS_DECODER 1
 #define CONFIG_LIBVPX_VP8_DECODER 0
 #define CONFIG_LIBVPX_VP9_DECODER 0
@@ -1191,11 +1191,11 @@
 #define CONFIG_BINTEXT_DECODER 1
 #define CONFIG_XBIN_DECODER 1
 #define CONFIG_IDF_DECODER 1
-#define CONFIG_H264_CUVID_DECODER 1
-#define CONFIG_HEVC_CUVID_DECODER 1
-#define CONFIG_VC1_CUVID_DECODER 1
-#define CONFIG_VP8_CUVID_DECODER 1
-#define CONFIG_VP9_CUVID_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
@@ -1449,9 +1449,14 @@
 #define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
@@ -1608,7 +1613,7 @@
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
 #define CONFIG_LIBFAAC_ENCODER 0
-#define CONFIG_LIBFDK_AAC_ENCODER 1
+#define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0
 #define CONFIG_LIBGSM_MS_ENCODER 0
 #define CONFIG_LIBILBC_ENCODER 1
@@ -1621,7 +1626,6 @@
 #define CONFIG_LIBSPEEX_ENCODER 1
 #define CONFIG_LIBTHEORA_ENCODER 1
 #define CONFIG_LIBTWOLAME_ENCODER 0
-#define CONFIG_LIBUTVIDEO_ENCODER 0
 #define CONFIG_LIBVO_AMRWBENC_ENCODER 0
 #define CONFIG_LIBVORBIS_ENCODER 1
 #define CONFIG_LIBVPX_VP8_ENCODER 1
@@ -1636,13 +1640,15 @@
 #define CONFIG_LIBXAVS_ENCODER 0
 #define CONFIG_LIBXVID_ENCODER 1
 #define CONFIG_LIBOPENH264_ENCODER 0
+#define CONFIG_H264_NVENC_ENCODER 1
+#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_H264_QSV_ENCODER 1
 #define CONFIG_H264_VAAPI_ENCODER 0
 #define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
 #define CONFIG_NVENC_ENCODER 1
-#define CONFIG_H264_OMX_ENCODER 0
 #define CONFIG_NVENC_H264_ENCODER 1
 #define CONFIG_NVENC_HEVC_ENCODER 1
+#define CONFIG_HEVC_NVENC_ENCODER 1
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_HEVC_VAAPI_ENCODER 0
 #define CONFIG_LIBKVAZAAR_ENCODER 0
@@ -1806,7 +1812,7 @@
 #define CONFIG_HQX_FILTER 1
 #define CONFIG_HWDOWNLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_FILTER 1
-#define CONFIG_HWUPLOAD_CUDA_FILTER 1
+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
 #define CONFIG_HSTACK_FILTER 1
 #define CONFIG_HUE_FILTER 1
 #define CONFIG_IDET_FILTER 1
@@ -1940,7 +1946,7 @@
 #define CONFIG_MOVIE_FILTER 1
 #define CONFIG_H263_VAAPI_HWACCEL 0
 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_H264_CUVID_HWACCEL 1
+#define CONFIG_H264_CUVID_HWACCEL 0
 #define CONFIG_H264_D3D11VA_HWACCEL 1
 #define CONFIG_H264_DXVA2_HWACCEL 1
 #define CONFIG_H264_MMAL_HWACCEL 0
@@ -1950,7 +1956,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 1
+#define CONFIG_HEVC_CUVID_HWACCEL 0
 #define CONFIG_HEVC_D3D11VA_HWACCEL 1
 #define CONFIG_HEVC_DXVA2_HWACCEL 1
 #define CONFIG_HEVC_QSV_HWACCEL 1
@@ -1971,15 +1977,15 @@
 #define CONFIG_MPEG4_VAAPI_HWACCEL 0
 #define CONFIG_MPEG4_VDPAU_HWACCEL 0
 #define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_VC1_CUVID_HWACCEL 1
+#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 1
-#define CONFIG_VP9_CUVID_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

--- a/SMP/ffmpeg.vcxproj
+++ b/SMP/ffmpeg.vcxproj
@@ -39,7 +39,6 @@
    <ClCompile Include="..\ffmpeg_opt.c" />
    <ClCompile Include="..\ffmpeg_filter.c" />
    <ClCompile Include="..\ffmpeg_qsv.c" />
-    <ClCompile Include="..\ffmpeg_cuvid.c" />
    <ClCompile Include="..\ffmpeg_dxva2.c" />
    <ClCompile Include="..\ffmpeg.c" />
  </ItemGroup>
@@ -180,7 +179,7 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -197,8 +196,8 @@
    <Link>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -239,7 +238,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -256,8 +255,8 @@ echo            These errors are the result of dead code elimination not being p
    <Link>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libmfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -297,7 +296,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -314,8 +313,8 @@ echo            These errors are the result of dead code elimination not being p
    <Link>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -356,7 +355,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -373,8 +372,8 @@ echo            These errors are the result of dead code elimination not being p
    <Link>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;mfxd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -422,7 +421,7 @@ echo            These errors are the result of dead code elimination not being p
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -440,8 +439,8 @@ echo            These errors are the result of dead code elimination not being p
      <OptimizeReferences>true</OptimizeReferences>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libmfx.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -482,7 +481,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -500,8 +499,8 @@ del ..\libavutil\ffversion.h
      <OptimizeReferences>true</OptimizeReferences>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libmfx.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libmfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -540,7 +539,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -559,8 +558,8 @@ del ..\libavutil\ffversion.h
      <OptimizeReferences>true</OptimizeReferences>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;mfx.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\Win32;$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -600,7 +599,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(CUDA_PATH)\include\;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -619,8 +618,8 @@ del ..\libavutil\ffversion.h
      <OptimizeReferences>true</OptimizeReferences>
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;mfx.lib;cuda.lib;nvcuvid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(CUDA_PATH)\lib\x64;$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;mfx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>

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

--- a/SMP/ffplay.vcxproj
+++ b/SMP/ffplay.vcxproj
@@ -175,7 +175,7 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -193,7 +193,7 @@
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdld.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -234,7 +234,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -252,7 +252,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;libsdld.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -292,7 +292,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -310,7 +310,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdld.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -351,7 +351,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -369,7 +369,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;sdld.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -417,7 +417,7 @@ echo            These errors are the result of dead code elimination not being p
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -436,7 +436,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -477,7 +477,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -496,7 +496,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;libsdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -535,7 +535,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -555,7 +555,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -595,7 +595,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OutDir)\include\SDL;.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -615,7 +615,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;sdl.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>

--- a/SMP/ffprobe.vcxproj
+++ b/SMP/ffprobe.vcxproj
@@ -175,7 +175,7 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -193,7 +193,7 @@
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -234,7 +234,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_LIB;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -252,7 +252,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdeviced.lib;libavfilterd.lib;libavformatd.lib;libavcodecd.lib;libpostprocd.lib;libswresampled.lib;libswscaled.lib;libavutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -292,7 +292,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -310,7 +310,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -351,7 +351,7 @@ echo            These errors are the result of dead code elimination not being p
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <PreprocessorDefinitions>WIN32;_WINDOWS;HAVE_AV_CONFIG_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;inline=__inline;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
@@ -369,7 +369,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdeviced.lib;avfilterd.lib;avformatd.lib;avcodecd.lib;postprocd.lib;swresampled.lib;swscaled.lib;avutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;LIBCPMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -417,7 +417,7 @@ echo            These errors are the result of dead code elimination not being p
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -436,7 +436,7 @@ echo            These errors are the result of dead code elimination not being p
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -477,7 +477,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -496,7 +496,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;libavdevice.lib;libavfilter.lib;libavformat.lib;libavcodec.lib;libpostproc.lib;libswresample.lib;libswscale.lib;libavutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -535,7 +535,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -555,7 +555,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
      <LargeAddressAware>true</LargeAddressAware>
@@ -595,7 +595,7 @@ del ..\libavutil\ffversion.h
      <C99Support>true</C99Support>
      <EnableAnsiAliasing Condition="'$(PlatformToolset)'!='Intel C++ Compiler XE 13.0'">true</EnableAnsiAliasing>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\;$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <ForcedIncludeFiles>compat.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -615,7 +615,7 @@ del ..\libavutil\ffversion.h
      <SubSystem>Console</SubSystem>
      <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
      <AdditionalDependencies>Psapi.lib;avdevice.lib;avfilter.lib;avformat.lib;avcodec.lib;postproc.lib;swresample.lib;swscale.lib;avutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
      <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -576,12 +576,24 @@
    <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\pixblockdsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
    <ClCompile Include="..\libavcodec\qpeldsp.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsv.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\rangecoder.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1341,6 +1353,15 @@
    <ClCompile Include="..\libavcodec\h2645_parse.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>
+    <ClCompile Include="..\libavcodec\qsvenc_h264.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\hapdec.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1377,6 +1398,15 @@
    <ClCompile Include="..\libavcodec\hevc_data.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>
+    <ClCompile Include="..\libavcodec\hevc_ps_enc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\hnm4video.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -1575,6 +1605,12 @@
    <ClCompile Include="..\libavcodec\mpeg12enc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\xvididct.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2211,6 +2247,9 @@
    <ClCompile Include="..\libavcodec\y41penc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\ylc.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\yop.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
@@ -2292,51 +2331,6 @@
    <ClCompile Include="..\libavcodec\dxva2_vc1.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>
-    <ClCompile Include="..\libavcodec\qsvdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\cuvid.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_h2645.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_h264.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_hevc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\hevc_ps_enc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvdec_mpeg2.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc_h264.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\nvenc_hevc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\libfdk-aacdec.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
-    <ClCompile Include="..\libavcodec\libfdk-aacenc.c">
-      <Filter>Source Files\libavcodec</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavcodec\libilbc.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>

--- a/SMP/libavdevice.vcxproj
+++ b/SMP/libavdevice.vcxproj
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -552,9 +552,6 @@
    <ClCompile Include="..\libavfilter\vf_hwdownload.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/libavformat.def
+++ b/SMP/libavformat.def
@@ -152,6 +152,7 @@ EXPORTS
    avio_wl32
    avio_wl64
    avio_write
+    avio_write_marker
    avpriv_dv_get_packet
    avpriv_dv_init_demux
    avpriv_dv_produce_packet

--- a/SMP/libavformat.vcxproj
+++ b/SMP/libavformat.vcxproj
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -230,6 +230,7 @@ EXPORTS
    av_hmac_init
    av_hmac_update
    av_hwdevice_ctx_alloc
+    av_hwdevice_ctx_create
    av_hwdevice_ctx_init
    av_hwdevice_get_hwframe_constraints
    av_hwdevice_hwconfig_alloc
@@ -395,6 +396,8 @@ EXPORTS
    av_small_strptime
    av_stereo3d_alloc
    av_stereo3d_create_side_data
+    av_stereo3d_from_name
+    av_stereo3d_type_name
    av_strcasecmp
    av_strdup
    av_strerror

--- a/SMP/libavutil.vcxproj
+++ b/SMP/libavutil.vcxproj
--- a/SMP/libavutil.vcxproj.filters
+++ b/SMP/libavutil.vcxproj.filters
@@ -249,7 +249,7 @@
    <ClCompile Include="..\libavutil\tea.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavutil\hwcontext_cuda.c">
+    <ClCompile Include="..\libavutil\hwcontext_dxva2.c">
      <Filter>Source Files\libavutil</Filter>
    </ClCompile>
    <ClCompile Include="..\libavutil\lzo.c">
@@ -377,6 +377,9 @@
    <ClInclude Include="..\libavutil\hwcontext_cuda.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>
+    <ClInclude Include="..\libavutil\hwcontext_dxva2.h">
+      <Filter>Header Files\libavutil</Filter>
+    </ClInclude>
    <ClInclude Include="..\libavutil\hwcontext_vaapi.h">
      <Filter>Header Files\libavutil</Filter>
    </ClInclude>

--- a/SMP/libpostproc.vcxproj
+++ b/SMP/libpostproc.vcxproj
--- a/SMP/libswresample.vcxproj
+++ b/SMP/libswresample.vcxproj
--- a/SMP/libswscale.vcxproj
+++ b/SMP/libswscale.vcxproj