projects: Update for recent upstream merge.

d047d9b4 · Matt Oliver · 490a36ad · d047d9b4 · d047d9b4 · d047d9b4
Showing with 7 addition and 0 deletion

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

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

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

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

未找到文件。
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -579,6 +579,7 @@
 %define CONFIG_MJPEG2JPEG_BSF 1
 %define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
 %define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1
+%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1
 %define CONFIG_MOV2TEXTSUB_BSF 1
 %define CONFIG_NOISE_BSF 1
 %define CONFIG_REMOVE_EXTRADATA_BSF 1

--- a/SMP/config.h
+++ b/SMP/config.h
@@ -626,6 +626,7 @@
 #define CONFIG_MJPEG2JPEG_BSF 1
 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1
+#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1
 #define CONFIG_MOV2TEXTSUB_BSF 1
 #define CONFIG_NOISE_BSF 1
 #define CONFIG_REMOVE_EXTRADATA_BSF 1

--- a/SMP/libavcodec.vcxproj
+++ b/SMP/libavcodec.vcxproj
@@ -1504,6 +1504,8 @@
    </ClCompile>
    <ClCompile Include="..\libavcodec\mjpega_dump_header_bsf.c">
    </ClCompile>
+    <ClCompile Include="..\libavcodec\mpeg4_unpack_bframes_bsf.c">
+    </ClCompile>
    <ClCompile Include="..\libavcodec\movsub_bsf.c">
    </ClCompile>
    <ClCompile Include="..\libavcodec\mp3_header_decompress_bsf.c">

--- a/SMP/libavcodec.vcxproj.filters
+++ b/SMP/libavcodec.vcxproj.filters
@@ -2237,6 +2237,9 @@
    <ClCompile Include="..\libavcodec\mjpega_dump_header_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>
+    <ClCompile Include="..\libavcodec\mpeg4_unpack_bframes_bsf.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
    <ClCompile Include="..\libavcodec\movsub_bsf.c">
      <Filter>Source Files\libavcodec</Filter>
    </ClCompile>