projects: Update for recent upstream merge.

ce4c6f2c · Matt Oliver · 41106427 · ce4c6f2c · ce4c6f2c · ce4c6f2c
Showing with 7 addition and 5 deletion

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

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

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

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

未找到文件。
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -1464,6 +1464,7 @@
 %define CONFIG_HEVC_QSV_ENCODER 1
 %define CONFIG_LIBKVAZAAR_ENCODER 0
 %define CONFIG_MPEG2_QSV_ENCODER 1
+%define CONFIG_ACROSSFADE_FILTER 1
 %define CONFIG_ADELAY_FILTER 1
 %define CONFIG_AECHO_FILTER 1
 %define CONFIG_AEVAL_FILTER 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -1511,6 +1511,7 @@
 #define CONFIG_HEVC_QSV_ENCODER 1
 #define CONFIG_LIBKVAZAAR_ENCODER 0
 #define CONFIG_MPEG2_QSV_ENCODER 1
+#define CONFIG_ACROSSFADE_FILTER 1
 #define CONFIG_ADELAY_FILTER 1
 #define CONFIG_AECHO_FILTER 1
 #define CONFIG_AEVAL_FILTER 1

--- a/SMP/libavfilter.vcxproj
+++ b/SMP/libavfilter.vcxproj
@@ -107,14 +107,14 @@
    </ClCompile>
    <ClCompile Include="..\libavfilter\avcodec.c">
    </ClCompile>
+    <ClCompile Include="..\libavfilter\af_afade.c">
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_adelay.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\af_aecho.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\aeval.c">
    </ClCompile>
-    <ClCompile Include="..\libavfilter\af_afade.c">
-    </ClCompile>
    <ClCompile Include="..\libavfilter\af_aformat.c">
    </ClCompile>
    <ClCompile Include="..\libavfilter\f_interleave.c">

--- a/SMP/libavfilter.vcxproj.filters
+++ b/SMP/libavfilter.vcxproj.filters
@@ -113,6 +113,9 @@
    <ClCompile Include="..\libavfilter\avcodec.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavfilter\af_afade.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavfilter\af_adelay.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
@@ -122,9 +125,6 @@
    <ClCompile Include="..\libavfilter\aeval.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>
-    <ClCompile Include="..\libavfilter\af_afade.c">
-      <Filter>Source Files\libavfilter</Filter>
-    </ClCompile>
    <ClCompile Include="..\libavfilter\af_aformat.c">
      <Filter>Source Files\libavfilter</Filter>
    </ClCompile>