From c650a8e1f85b7ff3f856403930d471025d6c2626 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 4 Jun 2018 00:52:28 +1000 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/config.asm | 2 ++ SMP/config.h | 2 ++ SMP/libavfilter.vcxproj | 3 +++ SMP/libavfilter.vcxproj.filters | 9 +++++++++ SMP/libavfilter/filter_list.c | 2 ++ 5 files changed, 18 insertions(+) diff --git a/SMP/config.asm b/SMP/config.asm index 3dee9ba5a7..174ae74dcb 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -1560,6 +1560,8 @@ %define CONFIG_ACOPY_FILTER 1 %define CONFIG_ACROSSFADE_FILTER 1 %define CONFIG_ACRUSHER_FILTER 1 +%define CONFIG_ADECLICK_FILTER 1 +%define CONFIG_ADECLIP_FILTER 1 %define CONFIG_ADELAY_FILTER 1 %define CONFIG_ADERIVATIVE_FILTER 1 %define CONFIG_AECHO_FILTER 1 diff --git a/SMP/config.h b/SMP/config.h index 88cc27bf90..3ee97f81e6 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -1646,6 +1646,8 @@ #define CONFIG_ACOPY_FILTER 1 #define CONFIG_ACROSSFADE_FILTER 1 #define CONFIG_ACRUSHER_FILTER 1 +#define CONFIG_ADECLICK_FILTER 1 +#define CONFIG_ADECLIP_FILTER 1 #define CONFIG_ADELAY_FILTER 1 #define CONFIG_ADERIVATIVE_FILTER 1 #define CONFIG_AECHO_FILTER 1 diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index 7098fee426..de96282ed4 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -121,6 +121,7 @@ + @@ -336,6 +337,8 @@ + + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index 22650962ce..771f4fa837 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -186,6 +186,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -831,6 +834,12 @@ Source Files\libavfilter + + Source Files\libavfilter + + + Source Files\libavfilter + Source Files\libavfilter diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c index 734ebc1570..5f7b5c77f3 100644 --- a/SMP/libavfilter/filter_list.c +++ b/SMP/libavfilter/filter_list.c @@ -25,6 +25,8 @@ static const AVFilter *filter_list[] = { &ff_af_acopy, &ff_af_acrossfade, &ff_af_acrusher, + &ff_af_adeclick, + &ff_af_adeclip, &ff_af_adelay, &ff_af_aderivative, &ff_af_aecho, -- GitLab