From ff14c7fe1776196d6993e426dd0b05e552c16c91 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 30 Apr 2017 19:57:13 +1000 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/config.asm | 6 +++++- SMP/config.h | 6 +++++- SMP/libavfilter.vcxproj | 1 + SMP/libavfilter.vcxproj.filters | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/SMP/config.asm b/SMP/config.asm index df4eaa7ea5..973fdb6a3f 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -234,6 +234,7 @@ %define HAVE_CDIO_PARANOIA_H 0 %define HAVE_CDIO_PARANOIA_PARANOIA_H 1 %define HAVE_CUDA_H 0 +%define HAVE_D3D11_H 1 %define HAVE_DISPATCH_DISPATCH_H 0 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 @@ -243,7 +244,6 @@ %define HAVE_DIRECT_H 1 %define HAVE_DIRENT_H 0 %define HAVE_DLFCN_H 0 -%define HAVE_D3D11_H 1 %define HAVE_DXVA_H 1 %define HAVE_ES2_GL_H 0 %define HAVE_GSM_H 0 @@ -587,6 +587,7 @@ %define CONFIG_FONTCONFIG 1 %define CONFIG_MEMORY_POISONING 0 %define CONFIG_NEON_CLOBBER_TEST 0 +%define CONFIG_OSSFUZZ 0 %define CONFIG_PIC 0 %define CONFIG_RAISE_MAJOR 0 %define CONFIG_THUMB 0 @@ -1835,6 +1836,7 @@ %define CONFIG_KERNDEINT_FILTER 1 %define CONFIG_LENSCORRECTION_FILTER 1 %define CONFIG_LOOP_FILTER 1 +%define CONFIG_LUMAKEY_FILTER 1 %define CONFIG_LUT_FILTER 1 %define CONFIG_LUT2_FILTER 1 %define CONFIG_LUT3D_FILTER 1 @@ -1857,6 +1859,7 @@ %define CONFIG_NULL_FILTER 1 %define CONFIG_OCR_FILTER 0 %define CONFIG_OCV_FILTER 0 +%define CONFIG_OSCILLOSCOPE_FILTER 1 %define CONFIG_OVERLAY_FILTER 1 %define CONFIG_OWDENOISE_FILTER 1 %define CONFIG_PAD_FILTER 1 @@ -1866,6 +1869,7 @@ %define CONFIG_PERSPECTIVE_FILTER 1 %define CONFIG_PHASE_FILTER 1 %define CONFIG_PIXDESCTEST_FILTER 1 +%define CONFIG_PIXSCOPE_FILTER 1 %define CONFIG_PP_FILTER 1 %define CONFIG_PP7_FILTER 1 %define CONFIG_PREMULTIPLY_FILTER 1 diff --git a/SMP/config.h b/SMP/config.h index 2c8844feaa..a17765aee9 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -264,6 +264,7 @@ #define HAVE_CDIO_PARANOIA_H 0 #define HAVE_CDIO_PARANOIA_PARANOIA_H 1 #define HAVE_CUDA_H 0 +#define HAVE_D3D11_H 1 #define HAVE_DISPATCH_DISPATCH_H 0 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 @@ -273,7 +274,6 @@ #define HAVE_DIRECT_H 1 #define HAVE_DIRENT_H 0 #define HAVE_DLFCN_H 0 -#define HAVE_D3D11_H 1 #define HAVE_DXVA_H 1 #define HAVE_ES2_GL_H 0 #define HAVE_GSM_H 0 @@ -644,6 +644,7 @@ #define CONFIG_FONTCONFIG 1 #define CONFIG_MEMORY_POISONING 0 #define CONFIG_NEON_CLOBBER_TEST 0 +#define CONFIG_OSSFUZZ 0 #define CONFIG_PIC 0 #define CONFIG_RAISE_MAJOR 0 #define CONFIG_THUMB 0 @@ -1892,6 +1893,7 @@ #define CONFIG_KERNDEINT_FILTER 1 #define CONFIG_LENSCORRECTION_FILTER 1 #define CONFIG_LOOP_FILTER 1 +#define CONFIG_LUMAKEY_FILTER 1 #define CONFIG_LUT_FILTER 1 #define CONFIG_LUT2_FILTER 1 #define CONFIG_LUT3D_FILTER 1 @@ -1914,6 +1916,7 @@ #define CONFIG_NULL_FILTER 1 #define CONFIG_OCR_FILTER 0 #define CONFIG_OCV_FILTER 0 +#define CONFIG_OSCILLOSCOPE_FILTER 1 #define CONFIG_OVERLAY_FILTER 1 #define CONFIG_OWDENOISE_FILTER 1 #define CONFIG_PAD_FILTER 1 @@ -1923,6 +1926,7 @@ #define CONFIG_PERSPECTIVE_FILTER 1 #define CONFIG_PHASE_FILTER 1 #define CONFIG_PIXDESCTEST_FILTER 1 +#define CONFIG_PIXSCOPE_FILTER 1 #define CONFIG_PP_FILTER 1 #define CONFIG_PP7_FILTER 1 #define CONFIG_PREMULTIPLY_FILTER 1 diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index 902beefbd3..47cc3cdcc5 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -258,6 +258,7 @@ + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index f79b2bc68b..697a3f59df 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -597,6 +597,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter -- GitLab