From f919964b4489a8d023b0c4e14a654c2350235c32 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 10 Jan 2021 21:56:08 +1100
Subject: [PATCH] projects: Update for upstream merge.

---
 SMP/config.asm                  |  3 +++
 SMP/config.h                    |  5 ++++-
 SMP/libavcodec.vcxproj          |  2 ++
 SMP/libavcodec.vcxproj.filters  |  6 ++++++
 SMP/libavfilter.vcxproj         |  5 +++++
 SMP/libavfilter.vcxproj.filters | 15 +++++++++++++++
 SMP/libavfilter/filter_list.c   |  2 ++
 7 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index 0e57aadd21..6c191a5668 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -238,6 +238,7 @@
 %define HAVE_ES2_GL_H 0
 %define HAVE_GSM_H 0
 %define HAVE_IO_H 1
+%define HAVE_LINUX_DMA_BUF_H 0
 %define HAVE_LINUX_PERF_EVENT_H 0
 %define HAVE_MACHINE_IOCTL_BT848_H 0
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
@@ -2035,6 +2036,7 @@
 %define CONFIG_SHOWINFO_FILTER 1
 %define CONFIG_SHOWPALETTE_FILTER 1
 %define CONFIG_SHUFFLEFRAMES_FILTER 1
+%define CONFIG_SHUFFLEPIXELS_FILTER 1
 %define CONFIG_SHUFFLEPLANES_FILTER 1
 %define CONFIG_SIDEDATA_FILTER 1
 %define CONFIG_SIGNALSTATS_FILTER 1
@@ -2062,6 +2064,7 @@
 %define CONFIG_TINTERLACE_FILTER 1
 %define CONFIG_TLUT2_FILTER 1
 %define CONFIG_TMEDIAN_FILTER 1
+%define CONFIG_TMIDEQUALIZER_FILTER 1
 %define CONFIG_TMIX_FILTER 1
 %define CONFIG_TONEMAP_FILTER 1
 %define CONFIG_TONEMAP_OPENCL_FILTER 0
diff --git a/SMP/config.h b/SMP/config.h
index bd85bb112e..6ec860671f 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -27,7 +27,7 @@
 #endif
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --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 2020
+#define CONFIG_THIS_YEAR 2021
 #define FFMPEG_DATADIR "."
 #define AVCONV_DATADIR "."
 #if defined(__INTEL_COMPILER)
@@ -280,6 +280,7 @@
 #define HAVE_ES2_GL_H 0
 #define HAVE_GSM_H 0
 #define HAVE_IO_H 1
+#define HAVE_LINUX_DMA_BUF_H 0
 #define HAVE_LINUX_PERF_EVENT_H 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
@@ -2157,6 +2158,7 @@
 #define CONFIG_SHOWINFO_FILTER 1
 #define CONFIG_SHOWPALETTE_FILTER 1
 #define CONFIG_SHUFFLEFRAMES_FILTER 1
+#define CONFIG_SHUFFLEPIXELS_FILTER 1
 #define CONFIG_SHUFFLEPLANES_FILTER 1
 #define CONFIG_SIDEDATA_FILTER 1
 #define CONFIG_SIGNALSTATS_FILTER 1
@@ -2184,6 +2186,7 @@
 #define CONFIG_TINTERLACE_FILTER 1
 #define CONFIG_TLUT2_FILTER 1
 #define CONFIG_TMEDIAN_FILTER 1
+#define CONFIG_TMIDEQUALIZER_FILTER 1
 #define CONFIG_TMIX_FILTER 1
 #define CONFIG_TONEMAP_FILTER 1
 #define CONFIG_TONEMAP_OPENCL_FILTER 0
diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
index fe1ace26e0..c74d9695d1 100644
--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -290,6 +290,7 @@
     <ClCompile Include="..\libavcodec\aacdec.c" />
     <ClCompile Include="..\libavcodec\aactab.c" />
     <ClCompile Include="..\libavcodec\aacsbr.c" />
+    <ClCompile Include="..\libavcodec\aacps_common.c" />
     <ClCompile Include="..\libavcodec\aacps_float.c" />
     <ClCompile Include="..\libavcodec\kbdwin.c" />
     <ClCompile Include="..\libavcodec\aacpsdsp_float.c" />
@@ -826,6 +827,7 @@
     <ClCompile Include="..\libavcodec\qsvenc_vp9.c" />
     <ClCompile Include="..\libavcodec\vqavideo.c" />
     <ClCompile Include="..\libavcodec\wavpack.c" />
+    <ClCompile Include="..\libavcodec\wavpackdata.c" />
     <ClCompile Include="..\libavcodec\wavpackenc.c" />
     <ClCompile Include="..\libavcodec\wcmv.c" />
     <ClCompile Include="..\libavcodec\webp.c" />
diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
index 9902e02cca..1301dcb6c5 100644
--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -720,6 +720,9 @@
     <ClCompile Include="..\libavcodec\aacsbr.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\aacps_common.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\aacps_float.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
@@ -2328,6 +2331,9 @@
     <ClCompile Include="..\libavcodec\wavpack.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\wavpackdata.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\wavpackenc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
index ad22695ad7..b362186853 100644
--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -238,6 +238,7 @@
     <ClCompile Include="..\libavfilter\vf_chromashift.c" />
     <ClCompile Include="..\libavfilter\vf_ciescope.c" />
     <ClCompile Include="..\libavfilter\vf_codecview.c" />
+    <ClCompile Include="..\libavfilter\qp_table.c" />
     <ClCompile Include="..\libavfilter\vf_colorbalance.c" />
     <ClCompile Include="..\libavfilter\vf_colorchannelmixer.c" />
     <ClCompile Include="..\libavfilter\vf_colorkey.c" />
@@ -366,6 +367,7 @@
     <ClCompile Include="..\libavfilter\vf_showinfo.c" />
     <ClCompile Include="..\libavfilter\vf_showpalette.c" />
     <ClCompile Include="..\libavfilter\vf_shuffleframes.c" />
+    <ClCompile Include="..\libavfilter\vf_shufflepixels.c" />
     <ClCompile Include="..\libavfilter\vf_shuffleplanes.c" />
     <ClCompile Include="..\libavfilter\vf_signalstats.c" />
     <ClCompile Include="..\libavfilter\vf_signature.c" />
@@ -379,6 +381,7 @@
     <ClCompile Include="..\libavfilter\vf_thumbnail.c" />
     <ClCompile Include="..\libavfilter\vf_tile.c" />
     <ClCompile Include="..\libavfilter\vf_xmedian.c" />
+    <ClCompile Include="..\libavfilter\vf_tmidequalizer.c" />
     <ClCompile Include="..\libavfilter\vf_tonemap.c" />
     <ClCompile Include="..\libavfilter\vf_tpad.c" />
     <ClCompile Include="..\libavfilter\vf_unsharp.c" />
@@ -419,6 +422,8 @@
     <ClCompile Include="..\libavfilter\src_movie.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_interface.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_io_proc.c" />
+    <ClCompile Include="..\libavfilter\dnn\queue.c" />
+    <ClCompile Include="..\libavfilter\dnn\safe_queue.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layers.c" />
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_avgpool.c" />
diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
index 93c224e27a..1faa89431f 100644
--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -567,6 +567,9 @@
     <ClCompile Include="..\libavfilter\vf_codecview.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\qp_table.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_colorbalance.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -951,6 +954,9 @@
     <ClCompile Include="..\libavfilter\vf_shuffleframes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_shufflepixels.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_shuffleplanes.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -990,6 +996,9 @@
     <ClCompile Include="..\libavfilter\vf_xmedian.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_tmidequalizer.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\vf_tonemap.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
@@ -1110,6 +1119,12 @@
     <ClCompile Include="..\libavfilter\dnn\dnn_io_proc.c">
       <Filter>Source Files\libavfilter\dnn</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\queue.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libavfilter\dnn\safe_queue.c">
+      <Filter>Source Files\libavfilter\dnn</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c">
       <Filter>Source Files\libavfilter\dnn</Filter>
     </ClCompile>
diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c
index 197c055854..598c9bb110 100644
--- a/SMP/libavfilter/filter_list.c
+++ b/SMP/libavfilter/filter_list.c
@@ -338,6 +338,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_showinfo,
     &ff_vf_showpalette,
     &ff_vf_shuffleframes,
+    &ff_vf_shufflepixels,
     &ff_vf_shuffleplanes,
     &ff_vf_sidedata,
     &ff_vf_signalstats,
@@ -363,6 +364,7 @@ static const AVFilter *filter_list[] = {
     &ff_vf_tinterlace,
     &ff_vf_tlut2,
     &ff_vf_tmedian,
+    &ff_vf_tmidequalizer,
     &ff_vf_tmix,
     &ff_vf_tonemap,
     &ff_vf_tpad,
-- 
GitLab