From 7d3a65523c67583f377c8b6581dd6492f997ca38 Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 28 Jan 2018 22:14:28 +1100
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm             | 3 +++
 SMP/config.h               | 3 +++
 SMP/libavfilter/dce_defs.c | 3 +++
 SMP/libavutil.def          | 1 +
 4 files changed, 10 insertions(+)

diff --git a/SMP/config.asm b/SMP/config.asm
index a3c59c4e68..a3cd47299f 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1670,6 +1670,7 @@
 %define CONFIG_DEINTERLACE_VAAPI_FILTER 0
 %define CONFIG_DEJUDDER_FILTER 1
 %define CONFIG_DELOGO_FILTER 1
+%define CONFIG_DENOISE_VAAPI_FILTER 0
 %define CONFIG_DESHAKE_FILTER 1
 %define CONFIG_DESPILL_FILTER 1
 %define CONFIG_DETELECINE_FILTER 1
@@ -1770,6 +1771,7 @@
 %define CONFIG_PP7_FILTER 1
 %define CONFIG_PREMULTIPLY_FILTER 1
 %define CONFIG_PREWITT_FILTER 1
+%define CONFIG_PROCAMP_VAAPI_FILTER 0
 %define CONFIG_PROGRAM_OPENCL_FILTER 0
 %define CONFIG_PSEUDOCOLOR_FILTER 1
 %define CONFIG_PSNR_FILTER 1
@@ -1803,6 +1805,7 @@
 %define CONFIG_SETRANGE_FILTER 1
 %define CONFIG_SETSAR_FILTER 1
 %define CONFIG_SETTB_FILTER 1
+%define CONFIG_SHARPNESS_VAAPI_FILTER 0
 %define CONFIG_SHOWINFO_FILTER 1
 %define CONFIG_SHOWPALETTE_FILTER 1
 %define CONFIG_SHUFFLEFRAMES_FILTER 1
diff --git a/SMP/config.h b/SMP/config.h
index ad6e87c11e..77d593e802 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1756,6 +1756,7 @@
 #define CONFIG_DEINTERLACE_VAAPI_FILTER 0
 #define CONFIG_DEJUDDER_FILTER 1
 #define CONFIG_DELOGO_FILTER 1
+#define CONFIG_DENOISE_VAAPI_FILTER 0
 #define CONFIG_DESHAKE_FILTER 1
 #define CONFIG_DESPILL_FILTER 1
 #define CONFIG_DETELECINE_FILTER 1
@@ -1856,6 +1857,7 @@
 #define CONFIG_PP7_FILTER 1
 #define CONFIG_PREMULTIPLY_FILTER 1
 #define CONFIG_PREWITT_FILTER 1
+#define CONFIG_PROCAMP_VAAPI_FILTER 0
 #define CONFIG_PROGRAM_OPENCL_FILTER 0
 #define CONFIG_PSEUDOCOLOR_FILTER 1
 #define CONFIG_PSNR_FILTER 1
@@ -1889,6 +1891,7 @@
 #define CONFIG_SETRANGE_FILTER 1
 #define CONFIG_SETSAR_FILTER 1
 #define CONFIG_SETTB_FILTER 1
+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
 #define CONFIG_SHOWINFO_FILTER 1
 #define CONFIG_SHOWPALETTE_FILTER 1
 #define CONFIG_SHUFFLEFRAMES_FILTER 1
diff --git a/SMP/libavfilter/dce_defs.c b/SMP/libavfilter/dce_defs.c
index a3a01cb7b9..ca820436b8 100644
--- a/SMP/libavfilter/dce_defs.c
+++ b/SMP/libavfilter/dce_defs.c
@@ -183,15 +183,18 @@ const AVFilter ff_af_sofalizer = {0};
 const AVFilter ff_asrc_flite = {0};
 const AVFilter ff_vf_coreimage = {0};
 const AVFilter ff_vf_deinterlace_vaapi = {0};
+const AVFilter ff_vf_denoise_vaapi = {0};
 const AVFilter ff_vf_frei0r = {0};
 const AVFilter ff_vf_libvmaf = {0};
 const AVFilter ff_vf_ocr = {0};
 const AVFilter ff_vf_ocv = {0};
 const AVFilter ff_vf_overlay_opencl = {0};
+const AVFilter ff_vf_procamp_vaapi = {0};
 const AVFilter ff_vf_program_opencl = {0};
 const AVFilter ff_vf_scale_cuda = {0};
 const AVFilter ff_vf_scale_npp = {0};
 const AVFilter ff_vf_scale_vaapi = {0};
+const AVFilter ff_vf_sharpness_vaapi = {0};
 const AVFilter ff_vf_thumbnail_cuda = {0};
 const AVFilter ff_vf_unsharp_opencl = {0};
 const AVFilter ff_vf_vidstabdetect = {0};
diff --git a/SMP/libavutil.def b/SMP/libavutil.def
index 03a4a30a31..df24930bd7 100644
--- a/SMP/libavutil.def
+++ b/SMP/libavutil.def
@@ -11,6 +11,7 @@ EXPORTS
     av_aes_ctr_get_iv
     av_aes_ctr_increment_iv
     av_aes_ctr_init
+    av_aes_ctr_set_full_iv
     av_aes_ctr_set_iv
     av_aes_ctr_set_random_iv
     av_aes_init
-- 
GitLab