projects: Update for recent upstream merge.

82835b88 · Matt Oliver · 67a2625d · 82835b88 · 82835b88 · 82835b88
Showing with 7 addition and 0 deletion

SMP/config.asm SMP/config.asm +1 -0

SMP/config.h SMP/config.h +1 -0

SMP/libavfilter.vcxproj SMP/libavfilter.vcxproj +2 -0

SMP/libavfilter.vcxproj.filters SMP/libavfilter.vcxproj.filters +3 -0

未找到文件。
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1614,6 +1614,7 @@
 %define CONFIG_LUT_FILTER 1
 %define CONFIG_LUTRGB_FILTER 1
 %define CONFIG_LUTYUV_FILTER 1
+%define CONFIG_MASKEDMERGE_FILTER 1
 %define CONFIG_MCDEINT_FILTER 1
 %define CONFIG_MERGEPLANES_FILTER 1
 %define CONFIG_MPDECIMATE_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1661,6 +1661,7 @@
 #define CONFIG_LUT_FILTER 1
 #define CONFIG_LUTRGB_FILTER 1
 #define CONFIG_LUTYUV_FILTER 1
+#define CONFIG_MASKEDMERGE_FILTER 1
 #define CONFIG_MCDEINT_FILTER 1
 #define CONFIG_MERGEPLANES_FILTER 1
 #define CONFIG_MPDECIMATE_FILTER 1

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -351,6 +351,8 @@
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_lut.c">
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_mcdeint.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_mergeplanes.c">

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -470,6 +470,9 @@
    <ClCompile Include="..\libavfilter\vf_lut.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\vf_maskedmerge.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_mcdeint.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>