projects: Update for recent upstream merge.

ShiftMediaProject · Oct 16, 2016 · fba75e9 · fba75e9
1 parent 21e5901
commit fba75e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
@@ -144,6 +144,7 @@
     <ClCompile Include="..\libavfilter\af_asetrate.c" />
     <ClCompile Include="..\libavfilter\settb.c" />
     <ClCompile Include="..\libavfilter\af_ashowinfo.c" />
+    <ClCompile Include="..\libavfilter\f_sidedata.c" />
     <ClCompile Include="..\libavfilter\split.c" />
     <ClCompile Include="..\libavfilter\af_astats.c" />
     <ClCompile Include="..\libavfilter\f_streamselect.c" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -252,6 +252,9 @@
     <ClCompile Include="..\libavfilter\af_ashowinfo.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\f_sidedata.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\split.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>