projects: Update for recent upstream merge.

SMP/config.asm

@@ -440,7 +440,7 @@
 %define CONFIG_LIBFDK_AAC 0
 %define CONFIG_OPENSSL 0
 %define CONFIG_LIBTLS 0
-%define CONFIG_GMP 1
+%define CONFIG_GMP 0
 %define CONFIG_LIBLENSFUN 0
 %define CONFIG_LIBOPENCORE_AMRNB 0
 %define CONFIG_LIBOPENCORE_AMRWB 0
@@ -450,7 +450,7 @@
 %define CONFIG_RKMPP 0
 %define CONFIG_LIBSMBCLIENT 0
 %define CONFIG_CHROMAPRINT 0
-%define CONFIG_GCRYPT 0
+%define CONFIG_GCRYPT 1
 %define CONFIG_GNUTLS 1
 %define CONFIG_JNI 0
 %define CONFIG_LADSPA 0
@@ -461,6 +461,7 @@
 %define CONFIG_LIBCACA 0
 %define CONFIG_LIBCELT 0
 %define CONFIG_LIBCODEC2 0
+%define CONFIG_LIBDAV1D 0
 %define CONFIG_LIBDC1394 0
 %define CONFIG_LIBDRM 0
 %define CONFIG_LIBFLITE 0
@@ -1111,6 +1112,7 @@
 %define CONFIG_PCM_U24LE_DECODER 1
 %define CONFIG_PCM_U32BE_DECODER 1
 %define CONFIG_PCM_U32LE_DECODER 1
+%define CONFIG_PCM_VIDC_DECODER 1
 %define CONFIG_PCM_ZORK_DECODER 1
 %define CONFIG_GREMLIN_DPCM_DECODER 1
 %define CONFIG_INTERPLAY_DPCM_DECODER 1
@@ -1198,6 +1200,7 @@
 %define CONFIG_LIBAOM_AV1_DECODER 0
 %define CONFIG_LIBCELT_DECODER 0
 %define CONFIG_LIBCODEC2_DECODER 0
+%define CONFIG_LIBDAV1D_DECODER 0
 %define CONFIG_LIBDAVS2_DECODER 0
 %define CONFIG_LIBFDK_AAC_DECODER 0
 %define CONFIG_LIBGSM_DECODER 0
@@ -1364,6 +1367,7 @@
 %define CONFIG_PCM_U24LE_ENCODER 1
 %define CONFIG_PCM_U32BE_ENCODER 1
 %define CONFIG_PCM_U32LE_ENCODER 1
+%define CONFIG_PCM_VIDC_ENCODER 1
 %define CONFIG_ROQ_DPCM_ENCODER 1
 %define CONFIG_ADPCM_ADX_ENCODER 1
 %define CONFIG_ADPCM_G722_ENCODER 1
@@ -1704,6 +1708,7 @@
 %define CONFIG_BOXBLUR_FILTER 1
 %define CONFIG_BOXBLUR_OPENCL_FILTER 0
 %define CONFIG_BWDIF_FILTER 1
+%define CONFIG_CHROMAHOLD_FILTER 1
 %define CONFIG_CHROMAKEY_FILTER 1
 %define CONFIG_CIESCOPE_FILTER 1
 %define CONFIG_CODECVIEW_FILTER 1
@@ -1774,6 +1779,7 @@
 %define CONFIG_GBLUR_FILTER 1
 %define CONFIG_GEQ_FILTER 1
 %define CONFIG_GRADFUN_FILTER 1
+%define CONFIG_GRAPHMONITOR_FILTER 1
 %define CONFIG_GREYEDGE_FILTER 1
 %define CONFIG_HALDCLUT_FILTER 1
 %define CONFIG_HFLIP_FILTER 1
@@ -1874,6 +1880,7 @@
 %define CONFIG_SEPARATEFIELDS_FILTER 1
 %define CONFIG_SETDAR_FILTER 1
 %define CONFIG_SETFIELD_FILTER 1
+%define CONFIG_SETPARAMS_FILTER 1
 %define CONFIG_SETPTS_FILTER 1
 %define CONFIG_SETRANGE_FILTER 1
 %define CONFIG_SETSAR_FILTER 1
@@ -1910,6 +1917,7 @@
 %define CONFIG_TMIX_FILTER 1
 %define CONFIG_TONEMAP_FILTER 1
 %define CONFIG_TONEMAP_OPENCL_FILTER 0
+%define CONFIG_TPAD_FILTER 1
 %define CONFIG_TRANSPOSE_FILTER 1
 %define CONFIG_TRANSPOSE_NPP_FILTER 0
 %define CONFIG_TRIM_FILTER 1
@@ -1921,6 +1929,7 @@
 %define CONFIG_VECTORSCOPE_FILTER 1
 %define CONFIG_VFLIP_FILTER 1
 %define CONFIG_VFRDET_FILTER 1
+%define CONFIG_VIBRANCE_FILTER 1
 %define CONFIG_VIDSTABDETECT_FILTER 0
 %define CONFIG_VIDSTABTRANSFORM_FILTER 0
 %define CONFIG_VIGNETTE_FILTER 1
@@ -1931,7 +1940,9 @@
 %define CONFIG_WAVEFORM_FILTER 1
 %define CONFIG_WEAVE_FILTER 1
 %define CONFIG_XBR_FILTER 1
+%define CONFIG_XSTACK_FILTER 1
 %define CONFIG_YADIF_FILTER 1
+%define CONFIG_YADIF_CUDA_FILTER 0
 %define CONFIG_ZMQ_FILTER 0
 %define CONFIG_ZOOMPAN_FILTER 1
 %define CONFIG_ZSCALE_FILTER 0
@@ -1958,6 +1969,7 @@
 %define CONFIG_NULLSINK_FILTER 1
 %define CONFIG_ABITSCOPE_FILTER 1
 %define CONFIG_ADRAWGRAPH_FILTER 1
+%define CONFIG_AGRAPHMONITOR_FILTER 1
 %define CONFIG_AHISTOGRAM_FILTER 1
 %define CONFIG_APHASEMETER_FILTER 1
 %define CONFIG_AVECTORSCOPE_FILTER 1
@@ -2135,6 +2147,7 @@
 %define CONFIG_PAF_DEMUXER 1
 %define CONFIG_PCM_ALAW_DEMUXER 1
 %define CONFIG_PCM_MULAW_DEMUXER 1
+%define CONFIG_PCM_VIDC_DEMUXER 1
 %define CONFIG_PCM_F64BE_DEMUXER 1
 %define CONFIG_PCM_F64LE_DEMUXER 1
 %define CONFIG_PCM_F32BE_DEMUXER 1
@@ -2368,6 +2381,7 @@
 %define CONFIG_OPUS_MUXER 1
 %define CONFIG_PCM_ALAW_MUXER 1
 %define CONFIG_PCM_MULAW_MUXER 1
+%define CONFIG_PCM_VIDC_MUXER 1
 %define CONFIG_PCM_F64BE_MUXER 1
 %define CONFIG_PCM_F64LE_MUXER 1
 %define CONFIG_PCM_F32BE_MUXER 1

SMP/config.h

@@ -21,7 +21,7 @@
 
 #ifndef SMP_CONFIG_H
 #define SMP_CONFIG_H
-#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-libxml2 --enable-gnutls --disable-schannel --enable-gmp --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --toolchain=msvc"
+#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --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-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
 #define FFMPEG_LICENSE "GPL version 3 or later"
 #define CONFIG_THIS_YEAR 2018
 #define FFMPEG_DATADIR "."
@@ -490,7 +490,7 @@
 #define CONFIG_LIBFDK_AAC 0
 #define CONFIG_OPENSSL 0
 #define CONFIG_LIBTLS 0
-#define CONFIG_GMP 1
+#define CONFIG_GMP 0
 #define CONFIG_LIBLENSFUN 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
@@ -500,7 +500,7 @@
 #define CONFIG_RKMPP 0
 #define CONFIG_LIBSMBCLIENT 0
 #define CONFIG_CHROMAPRINT 0
-#define CONFIG_GCRYPT 0
+#define CONFIG_GCRYPT 1
 #define CONFIG_GNUTLS 1
 #define CONFIG_JNI 0
 #define CONFIG_LADSPA 0
@@ -511,6 +511,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
@@ -1176,6 +1177,7 @@
 #define CONFIG_PCM_U24LE_DECODER 1
 #define CONFIG_PCM_U32BE_DECODER 1
 #define CONFIG_PCM_U32LE_DECODER 1
+#define CONFIG_PCM_VIDC_DECODER 1
 #define CONFIG_PCM_ZORK_DECODER 1
 #define CONFIG_GREMLIN_DPCM_DECODER 1
 #define CONFIG_INTERPLAY_DPCM_DECODER 1
@@ -1263,6 +1265,7 @@
 #define CONFIG_LIBAOM_AV1_DECODER 0
 #define CONFIG_LIBCELT_DECODER 0
 #define CONFIG_LIBCODEC2_DECODER 0
+#define CONFIG_LIBDAV1D_DECODER 0
 #define CONFIG_LIBDAVS2_DECODER 0
 #define CONFIG_LIBFDK_AAC_DECODER 0
 #define CONFIG_LIBGSM_DECODER 0
@@ -1429,6 +1432,7 @@
 #define CONFIG_PCM_U24LE_ENCODER 1
 #define CONFIG_PCM_U32BE_ENCODER 1
 #define CONFIG_PCM_U32LE_ENCODER 1
+#define CONFIG_PCM_VIDC_ENCODER 1
 #define CONFIG_ROQ_DPCM_ENCODER 1
 #define CONFIG_ADPCM_ADX_ENCODER 1
 #define CONFIG_ADPCM_G722_ENCODER 1
@@ -1790,6 +1794,7 @@
 #define CONFIG_BOXBLUR_FILTER 1
 #define CONFIG_BOXBLUR_OPENCL_FILTER 0
 #define CONFIG_BWDIF_FILTER 1
+#define CONFIG_CHROMAHOLD_FILTER 1
 #define CONFIG_CHROMAKEY_FILTER 1
 #define CONFIG_CIESCOPE_FILTER 1
 #define CONFIG_CODECVIEW_FILTER 1
@@ -1860,6 +1865,7 @@
 #define CONFIG_GBLUR_FILTER 1
 #define CONFIG_GEQ_FILTER 1
 #define CONFIG_GRADFUN_FILTER 1
+#define CONFIG_GRAPHMONITOR_FILTER 1
 #define CONFIG_GREYEDGE_FILTER 1
 #define CONFIG_HALDCLUT_FILTER 1
 #define CONFIG_HFLIP_FILTER 1
@@ -1960,6 +1966,7 @@
 #define CONFIG_SEPARATEFIELDS_FILTER 1
 #define CONFIG_SETDAR_FILTER 1
 #define CONFIG_SETFIELD_FILTER 1
+#define CONFIG_SETPARAMS_FILTER 1
 #define CONFIG_SETPTS_FILTER 1
 #define CONFIG_SETRANGE_FILTER 1
 #define CONFIG_SETSAR_FILTER 1
@@ -1996,6 +2003,7 @@
 #define CONFIG_TMIX_FILTER 1
 #define CONFIG_TONEMAP_FILTER 1
 #define CONFIG_TONEMAP_OPENCL_FILTER 0
+#define CONFIG_TPAD_FILTER 1
 #define CONFIG_TRANSPOSE_FILTER 1
 #define CONFIG_TRANSPOSE_NPP_FILTER 0
 #define CONFIG_TRIM_FILTER 1
@@ -2007,6 +2015,7 @@
 #define CONFIG_VECTORSCOPE_FILTER 1
 #define CONFIG_VFLIP_FILTER 1
 #define CONFIG_VFRDET_FILTER 1
+#define CONFIG_VIBRANCE_FILTER 1
 #define CONFIG_VIDSTABDETECT_FILTER 0
 #define CONFIG_VIDSTABTRANSFORM_FILTER 0
 #define CONFIG_VIGNETTE_FILTER 1
@@ -2017,7 +2026,9 @@
 #define CONFIG_WAVEFORM_FILTER 1
 #define CONFIG_WEAVE_FILTER 1
 #define CONFIG_XBR_FILTER 1
+#define CONFIG_XSTACK_FILTER 1
 #define CONFIG_YADIF_FILTER 1
+#define CONFIG_YADIF_CUDA_FILTER 0
 #define CONFIG_ZMQ_FILTER 0
 #define CONFIG_ZOOMPAN_FILTER 1
 #define CONFIG_ZSCALE_FILTER 0
@@ -2044,6 +2055,7 @@
 #define CONFIG_NULLSINK_FILTER 1
 #define CONFIG_ABITSCOPE_FILTER 1
 #define CONFIG_ADRAWGRAPH_FILTER 1
+#define CONFIG_AGRAPHMONITOR_FILTER 1
 #define CONFIG_AHISTOGRAM_FILTER 1
 #define CONFIG_APHASEMETER_FILTER 1
 #define CONFIG_AVECTORSCOPE_FILTER 1
@@ -2221,6 +2233,7 @@
 #define CONFIG_PAF_DEMUXER 1
 #define CONFIG_PCM_ALAW_DEMUXER 1
 #define CONFIG_PCM_MULAW_DEMUXER 1
+#define CONFIG_PCM_VIDC_DEMUXER 1
 #define CONFIG_PCM_F64BE_DEMUXER 1
 #define CONFIG_PCM_F64LE_DEMUXER 1
 #define CONFIG_PCM_F32BE_DEMUXER 1
@@ -2454,6 +2467,7 @@
 #define CONFIG_OPUS_MUXER 1
 #define CONFIG_PCM_ALAW_MUXER 1
 #define CONFIG_PCM_MULAW_MUXER 1
+#define CONFIG_PCM_VIDC_MUXER 1
 #define CONFIG_PCM_F64BE_MUXER 1
 #define CONFIG_PCM_F64LE_MUXER 1
 #define CONFIG_PCM_F32BE_MUXER 1

SMP/libavcodec/codec_list.c

@@ -151,6 +151,7 @@ static const AVCodec *codec_list[] = {
     &ff_pcm_u24le_encoder,
     &ff_pcm_u32be_encoder,
     &ff_pcm_u32le_encoder,
+    &ff_pcm_vidc_encoder,
     &ff_roq_dpcm_encoder,
     &ff_adpcm_adx_encoder,
     &ff_adpcm_g722_encoder,
@@ -555,6 +556,7 @@ static const AVCodec *codec_list[] = {
     &ff_pcm_u24le_decoder,
     &ff_pcm_u32be_decoder,
     &ff_pcm_u32le_decoder,
+    &ff_pcm_vidc_decoder,
     &ff_pcm_zork_decoder,
     &ff_gremlin_dpcm_decoder,
     &ff_interplay_dpcm_decoder,

SMP/libavfilter.vcxproj

@@ -277,6 +277,7 @@
     <ClCompile Include="..\libavfilter\vf_framestep.c" />
     <ClCompile Include="..\libavfilter\vf_gblur.c" />
     <ClCompile Include="..\libavfilter\vf_geq.c" />
+    <ClCompile Include="..\libavfilter\f_graphmonitor.c" />
     <ClCompile Include="..\libavfilter\vf_colorconstancy.c" />
     <ClCompile Include="..\libavfilter\vf_lut3d.c" />
     <ClCompile Include="..\libavfilter\vf_histeq.c" />
@@ -337,7 +338,6 @@
     <ClCompile Include="..\libavfilter\vf_selectivecolor.c" />
     <ClCompile Include="..\libavfilter\vf_separatefields.c" />
     <ClCompile Include="..\libavfilter\vf_aspect.c" />
-    <ClCompile Include="..\libavfilter\vf_setfield.c" />
     <ClCompile Include="..\libavfilter\vf_setparams.c" />
     <ClCompile Include="..\libavfilter\vf_showinfo.c" />
     <ClCompile Include="..\libavfilter\vf_showpalette.c" />
@@ -355,6 +355,7 @@
     <ClCompile Include="..\libavfilter\vf_thumbnail.c" />
     <ClCompile Include="..\libavfilter\vf_tile.c" />
     <ClCompile Include="..\libavfilter\vf_tonemap.c" />
+    <ClCompile Include="..\libavfilter\vf_tpad.c" />
     <ClCompile Include="..\libavfilter\vf_transpose.c" />
     <ClCompile Include="..\libavfilter\vf_unsharp.c" />
     <ClCompile Include="..\libavfilter\vf_uspp.c" />
@@ -362,11 +363,13 @@
     <ClCompile Include="..\libavfilter\vf_vectorscope.c" />
     <ClCompile Include="..\libavfilter\vf_vflip.c" />
     <ClCompile Include="..\libavfilter\vf_vfrdet.c" />
+    <ClCompile Include="..\libavfilter\vf_vibrance.c" />
     <ClCompile Include="..\libavfilter\vf_vignette.c" />
     <ClCompile Include="..\libavfilter\vf_vmafmotion.c" />
     <ClCompile Include="..\libavfilter\vf_vpp_qsv.c" />
     <ClCompile Include="..\libavfilter\vf_waveform.c" />
     <ClCompile Include="..\libavfilter\vf_xbr.c" />
+    <ClCompile Include="..\libavfilter\yadif_common.c" />
     <ClCompile Include="..\libavfilter\vf_zoompan.c" />
     <ClCompile Include="..\libavfilter\vsrc_testsrc.c" />
     <ClCompile Include="..\libavfilter\vsrc_cellauto.c" />

SMP/libavfilter.vcxproj.filters

@@ -654,6 +654,9 @@
     <ClCompile Include="..\libavfilter\vf_geq.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_graphmonitor.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorconstancy.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -834,9 +837,6 @@
     <ClCompile Include="..\libavfilter\vf_aspect.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
-    <ClCompile Include="..\libavfilter\vf_setfield.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_setparams.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -888,6 +888,9 @@
     <ClCompile Include="..\libavfilter\vf_tonemap.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_tpad.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_transpose.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -909,6 +912,9 @@
     <ClCompile Include="..\libavfilter\vf_vfrdet.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_vibrance.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vignette.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -924,6 +930,9 @@
     <ClCompile Include="..\libavfilter\vf_xbr.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\yadif_common.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_zoompan.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavfilter/filter_list.c

@@ -139,6 +139,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_bm3d,
     &ff_vf_boxblur,
     &ff_vf_bwdif,
+    &ff_vf_chromahold,
     &ff_vf_chromakey,
     &ff_vf_ciescope,
     &ff_vf_codecview,
@@ -202,6 +203,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_gblur,
     &ff_vf_geq,
     &ff_vf_gradfun,
+    &ff_vf_graphmonitor,
     &ff_vf_greyedge,
     &ff_vf_haldclut,
     &ff_vf_hflip,
@@ -290,6 +292,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_separatefields,
     &ff_vf_setdar,
     &ff_vf_setfield,
+    &ff_vf_setparams,
     &ff_vf_setpts,
     &ff_vf_setrange,
     &ff_vf_setsar,
@@ -322,6 +325,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_tlut2,
     &ff_vf_tmix,
     &ff_vf_tonemap,
+    &ff_vf_tpad,
     &ff_vf_transpose,
     &ff_vf_trim,
     &ff_vf_unpremultiply,
@@ -331,6 +335,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_vectorscope,
     &ff_vf_vflip,
     &ff_vf_vfrdet,
+    &ff_vf_vibrance,
     &ff_vf_vignette,
     &ff_vf_vmafmotion,
     &ff_vf_vpp_qsv,
@@ -339,6 +344,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_waveform,
     &ff_vf_weave,
     &ff_vf_xbr,
+    &ff_vf_xstack,
     &ff_vf_yadif,
     &ff_vf_zoompan,
     &ff_vsrc_allrgb,
@@ -361,6 +367,7 @@ static const AVFilter *filter_list[] = {
     &ff_vsink_nullsink,
     &ff_avf_abitscope,
     &ff_avf_adrawgraph,
+    &ff_avf_agraphmonitor,
     &ff_avf_ahistogram,
     &ff_avf_aphasemeter,
     &ff_avf_avectorscope,

SMP/libavformat.vcxproj

@@ -797,7 +797,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -859,7 +859,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX64</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2d.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -925,7 +925,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gcryptd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -994,7 +994,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gmpd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;bz2d.lib;zlibd.lib;gcryptd.lib;gnutlsd.lib;blurayd.lib;gmed.lib;modplugd.lib;sshd.lib;xml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1061,7 +1061,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1129,7 +1129,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgmpd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodecd.lib;avutild.lib;libbz2d.lib;libzlibd.lib;libgcryptd.lib;libgnutlsd.lib;libblurayd.lib;libgmed.lib;libmodplugd.lib;libsshd.lib;libxml2d.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1199,7 +1199,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1265,7 +1265,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX64</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1337,7 +1337,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gcrypt.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1411,7 +1411,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gmp.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;bz2.lib;zlib.lib;gcrypt.lib;gnutls.lib;bluray.lib;gme.lib;modplug.lib;ssh.lib;xml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1484,7 +1484,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LargeAddressAware>true</LargeAddressAware>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
@@ -1558,7 +1558,7 @@ cd $(ProjectDir)
       <ProgramDatabaseFile>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDatabaseFile>
       <ModuleDefinitionFile>.\libavformat.def</ModuleDefinitionFile>
       <ProfileGuidedDatabase>$(IntDir)\$(TargetName).pgd</ProfileGuidedDatabase>
-      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avutil.lib;libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1625,7 +1625,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
@@ -1691,7 +1691,7 @@ cd $(ProjectDir)
       <TargetMachine>MachineX64</TargetMachine>
       <SubSystem>Windows</SubSystem>
       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgmp.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libbz2.lib;libzlib.lib;libgcrypt.lib;libgnutls.lib;libbluray.lib;libgme.lib;libmodplug.lib;libssh.lib;libxml2.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4006,4221,4049,4217,4197,4099 %(AdditionalOptions)</AdditionalOptions>
     </Lib>

SMP/libavformat/demuxer_list.c

@@ -180,6 +180,7 @@ static const AVInputFormat *demuxer_list[] = {
     &ff_paf_demuxer,
     &ff_pcm_alaw_demuxer,
     &ff_pcm_mulaw_demuxer,
+    &ff_pcm_vidc_demuxer,
     &ff_pcm_f64be_demuxer,
     &ff_pcm_f64le_demuxer,
     &ff_pcm_f32be_demuxer,

SMP/libavformat/muxer_list.c

@@ -119,6 +119,7 @@ static const AVOutputFormat *muxer_list[] = {
     &ff_opus_muxer,
     &ff_pcm_alaw_muxer,
     &ff_pcm_mulaw_muxer,
+    &ff_pcm_vidc_muxer,
     &ff_pcm_f64be_muxer,
     &ff_pcm_f64le_muxer,
     &ff_pcm_f32be_muxer,

SMP/libavutil.def

@@ -395,6 +395,7 @@ EXPORTS
     av_rc4_crypt
     av_rc4_init
     av_read_image_line
+    av_read_image_line2
     av_realloc
     av_realloc_array
     av_realloc_f
@@ -490,6 +491,7 @@ EXPORTS
     av_version_info
     av_vlog
     av_write_image_line
+    av_write_image_line2
     av_xtea_alloc
     av_xtea_crypt
     av_xtea_init

SMP/libavutil/ffversion.h

@@ -21,5 +21,5 @@
 
 #ifndef SMP_LIBAVUTIL_FFVERSION_H
 #define SMP_LIBAVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "4.0.git"
+#define FFMPEG_VERSION "4.1.git"
 #endif /* SMP_LIBAVUTIL_FFVERSION_H */

SMP/project_get_dependencies.bat

@@ -8,7 +8,6 @@ fontconfig, ^
 freetype2, ^
 fribidi, ^
 game-music-emu, ^
-gmp, ^
 gnutls, ^
 lame, ^
 libass, ^
@@ -16,6 +15,7 @@ libbluray, ^
 libcdio, ^
 libcdio-paranoia, ^
 libiconv, ^
+libgcrypt, ^
 libilbc, ^
 liblzma, ^
 libssh, ^

SMP/readme.txt

@@ -19,7 +19,8 @@ Required project dependencies include:
     iconv
     zlib
     lzma
-    sdl
+    libxml2
+    sdl2
     libmp3lame
     libvorbis
     libspeex
@@ -38,13 +39,13 @@ Required project dependencies include:
     libfribidi
     libass
     gnutls
-    librtmp
+    libgcrypt
     libssh
     libcdio
 	libcdio_paranoia
     libbluray
     opengl
-    nvenc
+    ffnvcodec
 	libmfx
 
 Most of the above dependencies are supplied as part of the ShiftMediaProject repositories.
@@ -81,7 +82,7 @@ other sources may result in version mismatch or other issues. Although these ext
 with them are not covered by ShiftMediaProject and so they should be used with discretion.
 	
 
-*** Building with NASM ***
+*** Building with ASM ***
 
 In order to build FFmpeg using msvc you must first download and install NASM.
 NASM is required to compile all assembly files.