From 8d7ac27f4e16eb750c0e3518010f1ed8a2c4140c Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 28 Aug 2016 18:23:29 +1000
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm                  |  8 ++++++++
 SMP/config.h                    |  8 ++++++++
 SMP/libavcodec.vcxproj          |  1 +
 SMP/libavcodec.vcxproj.filters  |  3 +++
 SMP/libavfilter.vcxproj         |  7 +++++++
 SMP/libavfilter.vcxproj.filters | 21 +++++++++++++++++++++
 6 files changed, 48 insertions(+)

diff --git a/SMP/config.asm b/SMP/config.asm
index f0622d7ebfb0e..4fdcd2e0d42e8 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1775,6 +1775,7 @@
 %define CONFIG_HWDOWNLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_FILTER 1
 %define CONFIG_HWUPLOAD_CUDA_FILTER 0
+%define CONFIG_HYSTERESIS_FILTER 1
 %define CONFIG_IDET_FILTER 1
 %define CONFIG_IL_FILTER 1
 %define CONFIG_INFLATE_FILTER 1
@@ -1784,13 +1785,17 @@
 %define CONFIG_LENSCORRECTION_FILTER 1
 %define CONFIG_LOOP_FILTER 1
 %define CONFIG_LUT_FILTER 1
+%define CONFIG_LUT2_FILTER 1
 %define CONFIG_LUT3D_FILTER 1
 %define CONFIG_LUTRGB_FILTER 1
 %define CONFIG_LUTYUV_FILTER 1
+%define CONFIG_MASKEDCLAMP_FILTER 1
 %define CONFIG_MASKEDMERGE_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
 %define CONFIG_MERGEPLANES_FILTER 1
+%define CONFIG_MESTIMATE_FILTER 1
 %define CONFIG_METADATA_FILTER 1
+%define CONFIG_MINTERPOLATE_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1
 %define CONFIG_NEGATE_FILTER 1
 %define CONFIG_NNEDI_FILTER 1
@@ -1860,6 +1865,7 @@
 %define CONFIG_TRIM_FILTER 1
 %define CONFIG_UNSHARP_FILTER 1
 %define CONFIG_USPP_FILTER 1
+%define CONFIG_VAGUEDENOISER_FILTER 1
 %define CONFIG_VECTORSCOPE_FILTER 1
 %define CONFIG_VFLIP_FILTER 1
 %define CONFIG_VIDSTABDETECT_FILTER 0
@@ -1888,6 +1894,7 @@
 %define CONFIG_SMPTEHDBARS_FILTER 1
 %define CONFIG_TESTSRC_FILTER 1
 %define CONFIG_TESTSRC2_FILTER 1
+%define CONFIG_YUVTESTSRC_FILTER 1
 %define CONFIG_NULLSINK_FILTER 1
 %define CONFIG_ADRAWGRAPH_FILTER 1
 %define CONFIG_AHISTOGRAM_FILTER 1
@@ -2005,6 +2012,7 @@
 %define CONFIG_F4V_MUXER 1
 %define CONFIG_FFM_MUXER 1
 %define CONFIG_FFMETADATA_MUXER 1
+%define CONFIG_FIFO_MUXER 0
 %define CONFIG_FILMSTRIP_MUXER 1
 %define CONFIG_FLAC_MUXER 1
 %define CONFIG_FLV_MUXER 1
diff --git a/SMP/config.h b/SMP/config.h
index 1f066e02fe5d1..7f53da655dc7d 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1825,6 +1825,7 @@
 #define CONFIG_HWDOWNLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_FILTER 1
 #define CONFIG_HWUPLOAD_CUDA_FILTER 0
+#define CONFIG_HYSTERESIS_FILTER 1
 #define CONFIG_IDET_FILTER 1
 #define CONFIG_IL_FILTER 1
 #define CONFIG_INFLATE_FILTER 1
@@ -1834,13 +1835,17 @@
 #define CONFIG_LENSCORRECTION_FILTER 1
 #define CONFIG_LOOP_FILTER 1
 #define CONFIG_LUT_FILTER 1
+#define CONFIG_LUT2_FILTER 1
 #define CONFIG_LUT3D_FILTER 1
 #define CONFIG_LUTRGB_FILTER 1
 #define CONFIG_LUTYUV_FILTER 1
+#define CONFIG_MASKEDCLAMP_FILTER 1
 #define CONFIG_MASKEDMERGE_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
+#define CONFIG_MESTIMATE_FILTER 1
 #define CONFIG_METADATA_FILTER 1
+#define CONFIG_MINTERPOLATE_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1
 #define CONFIG_NEGATE_FILTER 1
 #define CONFIG_NNEDI_FILTER 1
@@ -1910,6 +1915,7 @@
 #define CONFIG_TRIM_FILTER 1
 #define CONFIG_UNSHARP_FILTER 1
 #define CONFIG_USPP_FILTER 1
+#define CONFIG_VAGUEDENOISER_FILTER 1
 #define CONFIG_VECTORSCOPE_FILTER 1
 #define CONFIG_VFLIP_FILTER 1
 #define CONFIG_VIDSTABDETECT_FILTER 0
@@ -1938,6 +1944,7 @@
 #define CONFIG_SMPTEHDBARS_FILTER 1
 #define CONFIG_TESTSRC_FILTER 1
 #define CONFIG_TESTSRC2_FILTER 1
+#define CONFIG_YUVTESTSRC_FILTER 1
 #define CONFIG_NULLSINK_FILTER 1
 #define CONFIG_ADRAWGRAPH_FILTER 1
 #define CONFIG_AHISTOGRAM_FILTER 1
@@ -2065,6 +2072,7 @@
 #define CONFIG_F4V_MUXER 1
 #define CONFIG_FFM_MUXER 1
 #define CONFIG_FFMETADATA_MUXER 1
+#define CONFIG_FIFO_MUXER 0
 #define CONFIG_FILMSTRIP_MUXER 1
 #define CONFIG_FLAC_MUXER 1
 #define CONFIG_FLV_MUXER 1
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index 7792038aaa805..ebeb3b1bfe6c9 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -302,6 +302,7 @@
     <ClCompile Include="..\libavcodec\aliaspixenc.c" />
     <ClCompile Include="..\libavcodec\alsdec.c" />
     <ClCompile Include="..\libavcodec\bgmc.c" />
+    <ClCompile Include="..\libavcodec\mlz.c" />
     <ClCompile Include="..\libavcodec\amrnbdec.c" />
     <ClCompile Include="..\libavcodec\celp_filters.c" />
     <ClCompile Include="..\libavcodec\celp_math.c" />
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 235d161418058..fa4e3a7db5d16 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -726,6 +726,9 @@
     <ClCompile Include="..\libavcodec\bgmc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\mlz.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\amrnbdec.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index 36889e98f78fa..5c28ca50f52f7 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -243,12 +243,18 @@
     <ClCompile Include="..\libavfilter\vf_hue.c" />
     <ClCompile Include="..\libavfilter\vf_hwdownload.c" />
     <ClCompile Include="..\libavfilter\vf_hwupload.c" />
+    <ClCompile Include="..\libavfilter\vf_hysteresis.c" />
     <ClCompile Include="..\libavfilter\vf_il.c" />
     <ClCompile Include="..\libavfilter\vf_kerndeint.c" />
     <ClCompile Include="..\libavfilter\vf_lenscorrection.c" />
     <ClCompile Include="..\libavfilter\vf_lut.c" />
+    <ClCompile Include="..\libavfilter\vf_lut2.c" />
+    <ClCompile Include="..\libavfilter\vf_maskedclamp.c" />
     <ClCompile Include="..\libavfilter\vf_mcdeint.c" />
     <ClCompile Include="..\libavfilter\vf_mergeplanes.c" />
+    <ClCompile Include="..\libavfilter\vf_mestimate.c" />
+    <ClCompile Include="..\libavfilter\motion_estimation.c" />
+    <ClCompile Include="..\libavfilter\vf_minterpolate.c" />
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c" />
     <ClCompile Include="..\libavfilter\vf_nnedi.c" />
     <ClCompile Include="..\libavfilter\vf_noise.c" />
@@ -293,6 +299,7 @@
     <ClCompile Include="..\libavfilter\vf_transpose.c" />
     <ClCompile Include="..\libavfilter\vf_unsharp.c" />
     <ClCompile Include="..\libavfilter\vf_uspp.c" />
+    <ClCompile Include="..\libavfilter\vf_vaguedenoiser.c" />
     <ClCompile Include="..\libavfilter\vf_vectorscope.c" />
     <ClCompile Include="..\libavfilter\vf_vflip.c" />
     <ClCompile Include="..\libavfilter\vf_vignette.c" />
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 251ce66701f32..fb7c944d4a43d 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -549,6 +549,9 @@
     <ClCompile Include="..\libavfilter\vf_hwupload.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_hysteresis.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_il.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -561,12 +564,27 @@
     <ClCompile Include="..\libavfilter\vf_lut.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_lut2.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_maskedclamp.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_mcdeint.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
     <ClCompile Include="..\libavfilter\vf_mergeplanes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_mestimate.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\motion_estimation.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_minterpolate.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_mpdecimate.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -699,6 +717,9 @@
     <ClCompile Include="..\libavfilter\vf_uspp.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_vaguedenoiser.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_vectorscope.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>