From fba75e9e5722a1c4c3d36f976e35e92aba12d4b1 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 17 Oct 2016 10:24:10 +1100 Subject: [PATCH] projects: Update for recent upstream merge. --- SMP/config.asm | 2 ++ SMP/config.h | 2 ++ SMP/libavfilter.vcxproj | 1 + SMP/libavfilter.vcxproj.filters | 3 +++ 4 files changed, 8 insertions(+) diff --git a/SMP/config.asm b/SMP/config.asm index 11f3b52e9ee82..2716aef4aaca3 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -1655,6 +1655,7 @@ %define CONFIG_ASETRATE_FILTER 1 %define CONFIG_ASETTB_FILTER 1 %define CONFIG_ASHOWINFO_FILTER 1 +%define CONFIG_ASIDEDATA_FILTER 1 %define CONFIG_ASPLIT_FILTER 1 %define CONFIG_ASTATS_FILTER 1 %define CONFIG_ASTREAMSELECT_FILTER 1 @@ -1858,6 +1859,7 @@ %define CONFIG_SHOWPALETTE_FILTER 1 %define CONFIG_SHUFFLEFRAMES_FILTER 1 %define CONFIG_SHUFFLEPLANES_FILTER 1 +%define CONFIG_SIDEDATA_FILTER 1 %define CONFIG_SIGNALSTATS_FILTER 1 %define CONFIG_SMARTBLUR_FILTER 1 %define CONFIG_SOBEL_FILTER 1 diff --git a/SMP/config.h b/SMP/config.h index 179b4f6675727..d8aaff792bb9d 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -1705,6 +1705,7 @@ #define CONFIG_ASETRATE_FILTER 1 #define CONFIG_ASETTB_FILTER 1 #define CONFIG_ASHOWINFO_FILTER 1 +#define CONFIG_ASIDEDATA_FILTER 1 #define CONFIG_ASPLIT_FILTER 1 #define CONFIG_ASTATS_FILTER 1 #define CONFIG_ASTREAMSELECT_FILTER 1 @@ -1908,6 +1909,7 @@ #define CONFIG_SHOWPALETTE_FILTER 1 #define CONFIG_SHUFFLEFRAMES_FILTER 1 #define CONFIG_SHUFFLEPLANES_FILTER 1 +#define CONFIG_SIDEDATA_FILTER 1 #define CONFIG_SIGNALSTATS_FILTER 1 #define CONFIG_SMARTBLUR_FILTER 1 #define CONFIG_SOBEL_FILTER 1 diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index eb5eeb9ad559d..38c07df32793f 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -144,6 +144,7 @@ + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index ffd0433164614..1e1a1220f5fca 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -252,6 +252,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter