projects: Update for recent merge.

1a73a2d4 · Matt Oliver · 110b4563 · 1a73a2d4 · 1a73a2d4 · 1a73a2d4
Showing with 9 addition and 3 deletion

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

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

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

SMP/libavfilter.vcxproj.filters SMP/libavfilter.vcxproj.filters +4 -1

未找到文件。
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1530,6 +1530,7 @@
 %define CONFIG_SUBTITLES_FILTER 1
 %define CONFIG_SUPER2XSAI_FILTER 1
 %define CONFIG_SWAPUV_FILTER 1
+%define CONFIG_TBLEND_FILTER 1
 %define CONFIG_TELECINE_FILTER 1
 %define CONFIG_THUMBNAIL_FILTER 1
 %define CONFIG_TILE_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1577,6 +1577,7 @@
 #define CONFIG_SUBTITLES_FILTER 1
 #define CONFIG_SUPER2XSAI_FILTER 1
 #define CONFIG_SWAPUV_FILTER 1
+#define CONFIG_TBLEND_FILTER 1
 #define CONFIG_TELECINE_FILTER 1
 #define CONFIG_THUMBNAIL_FILTER 1
 #define CONFIG_TILE_FILTER 1

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -59,6 +59,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
+    <YASM Include="..\libavfilter\x86\vf_fspp.asm" />
    <YASM Include="..\libavfilter\x86\vf_gradfun.asm" />
    <YASM Include="..\libavfilter\x86\vf_hqdn3d.asm" />
    <YASM Include="..\libavfilter\x86\vf_idet.asm" />
@@ -264,6 +265,7 @@
    <ClCompile Include="..\libavfilter\vf_framepack.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_fspp.c">
+      <ObjectFileName>$(IntDir)\libavfilter_vf_fspp.obj</ObjectFileName>
    </ClCompile>
    <ClCompile Include="..\libavfilter\vf_geq.c">
    </ClCompile>
@@ -437,8 +439,7 @@
    </ClCompile>
    <ClCompile Include="..\libavfilter\log2_tab.c">
    </ClCompile>
-    <ClCompile Include="..\libavfilter\x86\vf_fspp.c">
-      <ObjectFileName>$(IntDir)\libavfilter_x86_vf_fspp.obj</ObjectFileName>
+    <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c">
    </ClCompile>

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -24,6 +24,9 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
+    <YASM Include="..\libavfilter\x86\vf_fspp.asm">
+      <Filter>Source Files\libavfilter\x86</Filter>
+    </YASM>
    <YASM Include="..\libavfilter\x86\vf_gradfun.asm">
      <Filter>Source Files\libavfilter\x86</Filter>
    </YASM>
@@ -593,7 +596,7 @@
    <ClCompile Include="..\libavfilter\log2_tab.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\x86\vf_fspp.c">
+    <ClCompile Include="..\libavfilter\x86\vf_fspp_init.c">
      <Filter>Source Files\libavfilter\x86</Filter>
    </ClCompile>
    <ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c">