project: Update for recent upstream merge.

Also added support for libxml2 in the new dash demuxer.

SMP/config.asm

@@ -444,7 +444,9 @@
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
 %define CONFIG_ALSA 0
+%define CONFIG_AVFOUNDATION 0
 %define CONFIG_BZLIB 1
+%define CONFIG_COREIMAGE 0
 %define CONFIG_ICONV 1
 %define CONFIG_JACK 0
 %define CONFIG_LIBXCB 0
@@ -522,6 +524,7 @@
 %define CONFIG_LIBVPX 1
 %define CONFIG_LIBWAVPACK 0
 %define CONFIG_LIBWEBP 0
+%define CONFIG_LIBXML2 1
 %define CONFIG_LIBZIMG 0
 %define CONFIG_LIBZMQ 0
 %define CONFIG_LIBZVBI 0
@@ -529,7 +532,6 @@
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 1
-%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CRYSTALHD 0
 %define CONFIG_CUDA 1
@@ -540,7 +542,7 @@
 %define CONFIG_VAAPI 0
 %define CONFIG_VDA 0
 %define CONFIG_VDPAU 0
-%define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_XVMC 0
 %define CONFIG_CUDA_SDK 0
 %define CONFIG_LIBNPP 0
@@ -587,6 +589,7 @@
 %define CONFIG_RDFT 1
 %define CONFIG_AUTODETECT 1
 %define CONFIG_FONTCONFIG 1
+%define CONFIG_LINUX_PERF 0
 %define CONFIG_MEMORY_POISONING 0
 %define CONFIG_NEON_CLOBBER_TEST 0
 %define CONFIG_OSSFUZZ 0
@@ -681,7 +684,6 @@
 %define CONFIG_VP3DSP 1
 %define CONFIG_VP56DSP 1
 %define CONFIG_VP8DSP 1
-%define CONFIG_VT_BT2020 0
 %define CONFIG_WMA_FREQS 1
 %define CONFIG_WMV2DSP 1
 %define CONFIG_AAC_ADTSTOASC_BSF 1
@@ -1236,6 +1238,7 @@
 %define CONFIG_CDXL_DEMUXER 1
 %define CONFIG_CINE_DEMUXER 1
 %define CONFIG_CONCAT_DEMUXER 1
+%define CONFIG_DASH_DEMUXER 1
 %define CONFIG_DATA_DEMUXER 1
 %define CONFIG_DAUD_DEMUXER 1
 %define CONFIG_DCSTR_DEMUXER 1
@@ -1734,6 +1737,7 @@
 %define CONFIG_EXTRASTEREO_FILTER 1
 %define CONFIG_FIREQUALIZER_FILTER 1
 %define CONFIG_FLANGER_FILTER 1
+%define CONFIG_HAAS_FILTER 1
 %define CONFIG_HDCD_FILTER 1
 %define CONFIG_HEADPHONE_FILTER 1
 %define CONFIG_HIGHPASS_FILTER 1
@@ -1788,6 +1792,7 @@
 %define CONFIG_COLORMATRIX_FILTER 1
 %define CONFIG_COLORSPACE_FILTER 1
 %define CONFIG_CONVOLUTION_FILTER 1
+%define CONFIG_CONVOLVE_FILTER 1
 %define CONFIG_COPY_FILTER 1
 %define CONFIG_COREIMAGE_FILTER 0
 %define CONFIG_COVER_RECT_FILTER 1
@@ -1805,6 +1810,7 @@
 %define CONFIG_DEJUDDER_FILTER 1
 %define CONFIG_DELOGO_FILTER 1
 %define CONFIG_DESHAKE_FILTER 1
+%define CONFIG_DESPILL_FILTER 1
 %define CONFIG_DETELECINE_FILTER 1
 %define CONFIG_DILATION_FILTER 1
 %define CONFIG_DISPLACE_FILTER 1
@@ -2089,7 +2095,6 @@
 %define CONFIG_OPENAL_INDEV 0
 %define CONFIG_OSS_INDEV 0
 %define CONFIG_PULSE_INDEV 0
-%define CONFIG_QTKIT_INDEV 0
 %define CONFIG_SNDIO_INDEV 0
 %define CONFIG_V4L2_INDEV 0
 %define CONFIG_VFWCAP_INDEV 1
@@ -2228,6 +2233,7 @@
 %define CONFIG_SPX_MUXER 1
 %define CONFIG_SPDIF_MUXER 1
 %define CONFIG_SRT_MUXER 1
+%define CONFIG_SUP_MUXER 1
 %define CONFIG_SWF_MUXER 1
 %define CONFIG_TEE_MUXER 1
 %define CONFIG_TG2_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-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-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_LICENSE "GPL version 3 or later"
 #define CONFIG_THIS_YEAR 2017
 #define FFMPEG_DATADIR "."
@@ -486,7 +486,9 @@
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
 #define CONFIG_ALSA 0
+#define CONFIG_AVFOUNDATION 0
 #define CONFIG_BZLIB 1
+#define CONFIG_COREIMAGE 0
 #define CONFIG_ICONV 1
 #define CONFIG_JACK 0
 #define CONFIG_LIBXCB 0
@@ -564,6 +566,7 @@
 #define CONFIG_LIBVPX 1
 #define CONFIG_LIBWAVPACK 0
 #define CONFIG_LIBWEBP 0
+#define CONFIG_LIBXML2 1
 #define CONFIG_LIBZIMG 0
 #define CONFIG_LIBZMQ 0
 #define CONFIG_LIBZVBI 0
@@ -571,7 +574,6 @@
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 1
-#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_CUDA 1
@@ -589,7 +591,7 @@
 #define CONFIG_VAAPI 0
 #define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
-#define CONFIG_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_XVMC 0
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
@@ -644,6 +646,7 @@
 #define CONFIG_RDFT 1
 #define CONFIG_AUTODETECT 1
 #define CONFIG_FONTCONFIG 1
+#define CONFIG_LINUX_PERF 0
 #define CONFIG_MEMORY_POISONING 0
 #define CONFIG_NEON_CLOBBER_TEST 0
 #define CONFIG_OSSFUZZ 0
@@ -738,7 +741,6 @@
 #define CONFIG_VP3DSP 1
 #define CONFIG_VP56DSP 1
 #define CONFIG_VP8DSP 1
-#define CONFIG_VT_BT2020 0
 #define CONFIG_WMA_FREQS 1
 #define CONFIG_WMV2DSP 1
 #define CONFIG_AAC_ADTSTOASC_BSF 1
@@ -1293,6 +1295,7 @@
 #define CONFIG_CDXL_DEMUXER 1
 #define CONFIG_CINE_DEMUXER 1
 #define CONFIG_CONCAT_DEMUXER 1
+#define CONFIG_DASH_DEMUXER 1
 #define CONFIG_DATA_DEMUXER 1
 #define CONFIG_DAUD_DEMUXER 1
 #define CONFIG_DCSTR_DEMUXER 1
@@ -1791,6 +1794,7 @@
 #define CONFIG_EXTRASTEREO_FILTER 1
 #define CONFIG_FIREQUALIZER_FILTER 1
 #define CONFIG_FLANGER_FILTER 1
+#define CONFIG_HAAS_FILTER 1
 #define CONFIG_HDCD_FILTER 1
 #define CONFIG_HEADPHONE_FILTER 1
 #define CONFIG_HIGHPASS_FILTER 1
@@ -1845,6 +1849,7 @@
 #define CONFIG_COLORMATRIX_FILTER 1
 #define CONFIG_COLORSPACE_FILTER 1
 #define CONFIG_CONVOLUTION_FILTER 1
+#define CONFIG_CONVOLVE_FILTER 1
 #define CONFIG_COPY_FILTER 1
 #define CONFIG_COREIMAGE_FILTER 0
 #define CONFIG_COVER_RECT_FILTER 1
@@ -1862,6 +1867,7 @@
 #define CONFIG_DEJUDDER_FILTER 1
 #define CONFIG_DELOGO_FILTER 1
 #define CONFIG_DESHAKE_FILTER 1
+#define CONFIG_DESPILL_FILTER 1
 #define CONFIG_DETELECINE_FILTER 1
 #define CONFIG_DILATION_FILTER 1
 #define CONFIG_DISPLACE_FILTER 1
@@ -2167,7 +2173,6 @@
 #define CONFIG_OPENAL_INDEV 0
 #define CONFIG_OSS_INDEV 0
 #define CONFIG_PULSE_INDEV 0
-#define CONFIG_QTKIT_INDEV 0
 #define CONFIG_SNDIO_INDEV 0
 #define CONFIG_V4L2_INDEV 0
 #define CONFIG_VFWCAP_INDEV 1
@@ -2306,6 +2311,7 @@
 #define CONFIG_SPX_MUXER 1
 #define CONFIG_SPDIF_MUXER 1
 #define CONFIG_SRT_MUXER 1
+#define CONFIG_SUP_MUXER 1
 #define CONFIG_SWF_MUXER 1
 #define CONFIG_TEE_MUXER 1
 #define CONFIG_TG2_MUXER 1

SMP/ffmpeg_deps.sln

@@ -67,6 +67,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libavformat", "libavformat.
 		{17D28A05-3CF7-4F15-B19C-6495EC7579B8} = {17D28A05-3CF7-4F15-B19C-6495EC7579B8}
 		{CA9A4A38-CC63-4BDB-8CFB-E058965DDA32} = {CA9A4A38-CC63-4BDB-8CFB-E058965DDA32}
 		{704AB765-90EE-4B99-9887-1B9ECFB7AB70} = {704AB765-90EE-4B99-9887-1B9ECFB7AB70}
+		{CFE70273-7A79-4815-AF95-1E02E2675E37} = {CFE70273-7A79-4815-AF95-1E02E2675E37}
 		{38E671C9-3FE3-40B7-A1AF-D2D566762186} = {38E671C9-3FE3-40B7-A1AF-D2D566762186}
 		{CE6C44DD-6E38-4293-8AB3-04EE28CCA972} = {CE6C44DD-6E38-4293-8AB3-04EE28CCA972}
 		{B67554E5-6253-4C94-8BCD-B8F87479970B} = {B67554E5-6253-4C94-8BCD-B8F87479970B}
@@ -1606,4 +1607,7 @@ Global
 		{71F9D348-17DC-4A18-870E-CFE4647F6422} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
 		{D82A9F8C-D671-4D9B-AE40-13CC6098AE69} = {0823582D-5403-47DA-A2A0-D479D4DED7A3}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2C67259A-66D0-4C02-B084-BA8E497C6921}
+	EndGlobalSection
 EndGlobal

SMP/libavdevice/dce_defs.c

@@ -36,7 +36,6 @@ const AVInputFormat ff_libndi_newtek_demuxer = {0};
 const AVInputFormat ff_openal_demuxer = {0};
 const AVInputFormat ff_oss_demuxer = {0};
 const AVInputFormat ff_pulse_demuxer = {0};
-const AVInputFormat ff_qtkit_demuxer = {0};
 const AVInputFormat ff_sndio_demuxer = {0};
 const AVInputFormat ff_v4l2_demuxer = {0};
 const AVInputFormat ff_xcbgrab_demuxer = {0};

SMP/libavfilter.def

@@ -18,6 +18,7 @@ EXPORTS
     av_buffersink_set_frame_size
     av_buffersrc_add_frame
     av_buffersrc_add_frame_flags
+    av_buffersrc_close
     av_buffersrc_get_nb_failed_requests
     av_buffersrc_parameters_alloc
     av_buffersrc_parameters_set

SMP/libavfilter.vcxproj

@@ -169,6 +169,7 @@
     <ClCompile Include="..\libavfilter\af_extrastereo.c" />
     <ClCompile Include="..\libavfilter\af_firequalizer.c" />
     <ClCompile Include="..\libavfilter\af_flanger.c" />
+    <ClCompile Include="..\libavfilter\af_haas.c" />
     <ClCompile Include="..\libavfilter\af_hdcd.c" />
     <ClCompile Include="..\libavfilter\af_headphone.c" />
     <ClCompile Include="..\libavfilter\af_join.c" />
@@ -210,6 +211,7 @@
     <ClCompile Include="..\libavfilter\vf_colormatrix.c" />
     <ClCompile Include="..\libavfilter\vf_colorspace.c" />
     <ClCompile Include="..\libavfilter\vf_convolution.c" />
+    <ClCompile Include="..\libavfilter\vf_convolve.c" />
     <ClCompile Include="..\libavfilter\vf_copy.c" />
     <ClCompile Include="..\libavfilter\vf_cover_rect.c" />
     <ClCompile Include="..\libavfilter\lavfutils.c" />
@@ -226,6 +228,7 @@
     <ClCompile Include="..\libavfilter\vf_dejudder.c" />
     <ClCompile Include="..\libavfilter\vf_delogo.c" />
     <ClCompile Include="..\libavfilter\vf_deshake.c" />
+    <ClCompile Include="..\libavfilter\vf_despill.c" />
     <ClCompile Include="..\libavfilter\vf_detelecine.c" />
     <ClCompile Include="..\libavfilter\vf_displace.c" />
     <ClCompile Include="..\libavfilter\vf_weave.c" />

SMP/libavfilter.vcxproj.filters

@@ -330,6 +330,9 @@
     <ClCompile Include="..\libavfilter\af_flanger.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_haas.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_hdcd.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -453,6 +456,9 @@
     <ClCompile Include="..\libavfilter\vf_convolution.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_convolve.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_copy.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -501,6 +507,9 @@
     <ClCompile Include="..\libavfilter\vf_deshake.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_despill.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_detelecine.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

SMP/libavformat.vcxproj.filters

@@ -421,6 +421,9 @@
     <ClCompile Include="..\libavformat\dashenc.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\dashdec.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\dauddec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1129,6 +1132,9 @@
     <ClCompile Include="..\libavformat\supdec.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\supenc.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\svag.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>

SMP/project_get_dependencies.bat

@@ -19,6 +19,7 @@ libiconv, ^
 libilbc, ^
 liblzma, ^
 libssh, ^
+libxml2, ^
 libvpx, ^
 mfx_dispatch, ^
 modplug, ^