projects: Update for recent upstream merge.

ShiftMediaProject · Aug 7, 2016 · 3c84b51 · 3c84b51
1 parent 37c4e49
commit 3c84b51
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 0 deletions.
diff --git a/SMP/config.asm b/SMP/config.asm
@@ -1658,6 +1658,7 @@
 %define CONFIG_CHORUS_FILTER 1
 %define CONFIG_COMPAND_FILTER 1
 %define CONFIG_COMPENSATIONDELAY_FILTER 1
+%define CONFIG_CRYSTALIZER_FILTER 1
 %define CONFIG_DCSHIFT_FILTER 1
 %define CONFIG_DYNAUDNORM_FILTER 1
 %define CONFIG_EARWAX_FILTER 1
@@ -2101,6 +2102,7 @@
 %define CONFIG_TGP_MUXER 1
 %define CONFIG_MKVTIMESTAMP_V2_MUXER 1
 %define CONFIG_TRUEHD_MUXER 1
+%define CONFIG_TTA_MUXER 1
 %define CONFIG_UNCODEDFRAMECRC_MUXER 1
 %define CONFIG_VC1_MUXER 1
 %define CONFIG_VC1T_MUXER 1

diff --git a/SMP/config.h b/SMP/config.h
@@ -1708,6 +1708,7 @@
 #define CONFIG_CHORUS_FILTER 1
 #define CONFIG_COMPAND_FILTER 1
 #define CONFIG_COMPENSATIONDELAY_FILTER 1
+#define CONFIG_CRYSTALIZER_FILTER 1
 #define CONFIG_DCSHIFT_FILTER 1
 #define CONFIG_DYNAUDNORM_FILTER 1
 #define CONFIG_EARWAX_FILTER 1
@@ -2161,6 +2162,7 @@
 #define CONFIG_TGP_MUXER 1
 #define CONFIG_MKVTIMESTAMP_V2_MUXER 1
 #define CONFIG_TRUEHD_MUXER 1
+#define CONFIG_TTA_MUXER 1
 #define CONFIG_UNCODEDFRAMECRC_MUXER 1
 #define CONFIG_VC1_MUXER 1
 #define CONFIG_VC1T_MUXER 1

diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj
@@ -136,6 +136,7 @@
     <YASM Include="..\libavcodec\x86\svq1enc.asm" />
     <YASM Include="..\libavcodec\x86\takdsp.asm" />
     <YASM Include="..\libavcodec\x86\ttadsp.asm" />
+    <YASM Include="..\libavcodec\x86\ttaencdsp.asm" />
     <YASM Include="..\libavcodec\x86\v210enc.asm" />
     <YASM Include="..\libavcodec\x86\v210.asm" />
     <YASM Include="..\libavcodec\x86\vorbisdsp.asm" />
@@ -921,6 +922,7 @@
     <ClCompile Include="..\libavcodec\x86\svq1enc_init.c" />
     <ClCompile Include="..\libavcodec\x86\takdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\ttadsp_init.c" />
+    <ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c" />
     <ClCompile Include="..\libavcodec\x86\v210-init.c" />
     <ClCompile Include="..\libavcodec\x86\v210enc_init.c" />
     <ClCompile Include="..\libavcodec\x86\vorbisdsp_init.c" />
@@ -1043,6 +1045,9 @@
     <ClCompile Include="..\libavcodec\ttadsp.c">
       <ObjectFileName>$(IntDir)\libavcodec_ttadsp.obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ttaencdsp.c">
+      <ObjectFileName>$(IntDir)\libavcodec_ttaencdsp.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\v210enc.c">
       <ObjectFileName>$(IntDir)\libavcodec_v210enc.obj</ObjectFileName>
     </ClCompile>

diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters
@@ -232,6 +232,9 @@
     <YASM Include="..\libavcodec\x86\ttadsp.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
+    <YASM Include="..\libavcodec\x86\ttaencdsp.asm">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </YASM>
     <YASM Include="..\libavcodec\x86\v210enc.asm">
       <Filter>Source Files\libavcodec\x86</Filter>
     </YASM>
@@ -2583,6 +2586,9 @@
     <ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c">
+      <Filter>Source Files\libavcodec\x86</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\x86\v210-init.c">
       <Filter>Source Files\libavcodec\x86</Filter>
     </ClCompile>
@@ -2733,6 +2739,9 @@
     <ClCompile Include="..\libavcodec\ttadsp.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavcodec\ttaencdsp.c">
+      <Filter>Source Files\libavcodec</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavcodec\v210enc.c">
       <Filter>Source Files\libavcodec</Filter>
     </ClCompile>

diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj
@@ -153,6 +153,7 @@
     <ClCompile Include="..\libavfilter\af_chorus.c" />
     <ClCompile Include="..\libavfilter\af_compand.c" />
     <ClCompile Include="..\libavfilter\af_compensationdelay.c" />
+    <ClCompile Include="..\libavfilter\af_crystalizer.c" />
     <ClCompile Include="..\libavfilter\af_dcshift.c" />
     <ClCompile Include="..\libavfilter\af_dynaudnorm.c" />
     <ClCompile Include="..\libavfilter\af_earwax.c" />

diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters
@@ -279,6 +279,9 @@
     <ClCompile Include="..\libavfilter\af_compensationdelay.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavfilter\af_crystalizer.c">
+      <Filter>Source Files\libavfilter</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavfilter\af_dcshift.c">
       <Filter>Source Files\libavfilter</Filter>
     </ClCompile>

diff --git a/SMP/libavformat.def b/SMP/libavformat.def
@@ -34,6 +34,7 @@ EXPORTS
     av_format_set_subtitle_codec
     av_format_set_video_codec
     av_get_frame_filename
+    av_get_frame_filename2
     av_get_output_timestamp
     av_get_packet
     av_guess_codec

diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj
@@ -428,12 +428,14 @@
     <ClCompile Include="..\libavformat\takdec.c" />
     <ClCompile Include="..\libavformat\tedcaptionsdec.c" />
     <ClCompile Include="..\libavformat\tee.c" />
+    <ClCompile Include="..\libavformat\tee_common.c" />
     <ClCompile Include="..\libavformat\thp.c" />
     <ClCompile Include="..\libavformat\3dostr.c" />
     <ClCompile Include="..\libavformat\tiertexseq.c" />
     <ClCompile Include="..\libavformat\mkvtimestamp_v2.c" />
     <ClCompile Include="..\libavformat\tmv.c" />
     <ClCompile Include="..\libavformat\tta.c" />
+    <ClCompile Include="..\libavformat\ttaenc.c" />
     <ClCompile Include="..\libavformat\tty.c" />
     <ClCompile Include="..\libavformat\txd.c" />
     <ClCompile Include="..\libavformat\uncodedframecrcenc.c" />

diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters
@@ -1105,6 +1105,9 @@
     <ClCompile Include="..\libavformat\tee.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\tee_common.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\thp.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
@@ -1123,6 +1126,9 @@
     <ClCompile Include="..\libavformat\tta.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>
+    <ClCompile Include="..\libavformat\ttaenc.c">
+      <Filter>Source Files\libavformat</Filter>
+    </ClCompile>
     <ClCompile Include="..\libavformat\tty.c">
       <Filter>Source Files\libavformat</Filter>
     </ClCompile>