Skip to content

Commit 3c84b51

Browse files
SibrasSibras
committed
projects: Update for recent upstream merge.
1 parent 37c4e49 commit 3c84b51

9 files changed

+31
-0
lines changed

‎SMP/config.asm

+2
Original file line numberDiff line numberDiff line change
@@ -1658,6 +1658,7 @@
16581658
%define CONFIG_CHORUS_FILTER 1
16591659
%define CONFIG_COMPAND_FILTER 1
16601660
%define CONFIG_COMPENSATIONDELAY_FILTER 1
1661+
%define CONFIG_CRYSTALIZER_FILTER 1
16611662
%define CONFIG_DCSHIFT_FILTER 1
16621663
%define CONFIG_DYNAUDNORM_FILTER 1
16631664
%define CONFIG_EARWAX_FILTER 1
@@ -2101,6 +2102,7 @@
21012102
%define CONFIG_TGP_MUXER 1
21022103
%define CONFIG_MKVTIMESTAMP_V2_MUXER 1
21032104
%define CONFIG_TRUEHD_MUXER 1
2105+
%define CONFIG_TTA_MUXER 1
21042106
%define CONFIG_UNCODEDFRAMECRC_MUXER 1
21052107
%define CONFIG_VC1_MUXER 1
21062108
%define CONFIG_VC1T_MUXER 1

‎SMP/config.h

+2
Original file line numberDiff line numberDiff line change
@@ -1708,6 +1708,7 @@
17081708
#define CONFIG_CHORUS_FILTER 1
17091709
#define CONFIG_COMPAND_FILTER 1
17101710
#define CONFIG_COMPENSATIONDELAY_FILTER 1
1711+
#define CONFIG_CRYSTALIZER_FILTER 1
17111712
#define CONFIG_DCSHIFT_FILTER 1
17121713
#define CONFIG_DYNAUDNORM_FILTER 1
17131714
#define CONFIG_EARWAX_FILTER 1
@@ -2161,6 +2162,7 @@
21612162
#define CONFIG_TGP_MUXER 1
21622163
#define CONFIG_MKVTIMESTAMP_V2_MUXER 1
21632164
#define CONFIG_TRUEHD_MUXER 1
2165+
#define CONFIG_TTA_MUXER 1
21642166
#define CONFIG_UNCODEDFRAMECRC_MUXER 1
21652167
#define CONFIG_VC1_MUXER 1
21662168
#define CONFIG_VC1T_MUXER 1

‎SMP/libavcodec.vcxproj

+5
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
<YASM Include="..\libavcodec\x86\svq1enc.asm" />
137137
<YASM Include="..\libavcodec\x86\takdsp.asm" />
138138
<YASM Include="..\libavcodec\x86\ttadsp.asm" />
139+
<YASM Include="..\libavcodec\x86\ttaencdsp.asm" />
139140
<YASM Include="..\libavcodec\x86\v210enc.asm" />
140141
<YASM Include="..\libavcodec\x86\v210.asm" />
141142
<YASM Include="..\libavcodec\x86\vorbisdsp.asm" />
@@ -921,6 +922,7 @@
921922
<ClCompile Include="..\libavcodec\x86\svq1enc_init.c" />
922923
<ClCompile Include="..\libavcodec\x86\takdsp_init.c" />
923924
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c" />
925+
<ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c" />
924926
<ClCompile Include="..\libavcodec\x86\v210-init.c" />
925927
<ClCompile Include="..\libavcodec\x86\v210enc_init.c" />
926928
<ClCompile Include="..\libavcodec\x86\vorbisdsp_init.c" />
@@ -1043,6 +1045,9 @@
10431045
<ClCompile Include="..\libavcodec\ttadsp.c">
10441046
<ObjectFileName>$(IntDir)\libavcodec_ttadsp.obj</ObjectFileName>
10451047
</ClCompile>
1048+
<ClCompile Include="..\libavcodec\ttaencdsp.c">
1049+
<ObjectFileName>$(IntDir)\libavcodec_ttaencdsp.obj</ObjectFileName>
1050+
</ClCompile>
10461051
<ClCompile Include="..\libavcodec\v210enc.c">
10471052
<ObjectFileName>$(IntDir)\libavcodec_v210enc.obj</ObjectFileName>
10481053
</ClCompile>

‎SMP/libavcodec.vcxproj.filters

+9
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@
232232
<YASM Include="..\libavcodec\x86\ttadsp.asm">
233233
<Filter>Source Files\libavcodec\x86</Filter>
234234
</YASM>
235+
<YASM Include="..\libavcodec\x86\ttaencdsp.asm">
236+
<Filter>Source Files\libavcodec\x86</Filter>
237+
</YASM>
235238
<YASM Include="..\libavcodec\x86\v210enc.asm">
236239
<Filter>Source Files\libavcodec\x86</Filter>
237240
</YASM>
@@ -2583,6 +2586,9 @@
25832586
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c">
25842587
<Filter>Source Files\libavcodec\x86</Filter>
25852588
</ClCompile>
2589+
<ClCompile Include="..\libavcodec\x86\ttaencdsp_init.c">
2590+
<Filter>Source Files\libavcodec\x86</Filter>
2591+
</ClCompile>
25862592
<ClCompile Include="..\libavcodec\x86\v210-init.c">
25872593
<Filter>Source Files\libavcodec\x86</Filter>
25882594
</ClCompile>
@@ -2733,6 +2739,9 @@
27332739
<ClCompile Include="..\libavcodec\ttadsp.c">
27342740
<Filter>Source Files\libavcodec</Filter>
27352741
</ClCompile>
2742+
<ClCompile Include="..\libavcodec\ttaencdsp.c">
2743+
<Filter>Source Files\libavcodec</Filter>
2744+
</ClCompile>
27362745
<ClCompile Include="..\libavcodec\v210enc.c">
27372746
<Filter>Source Files\libavcodec</Filter>
27382747
</ClCompile>

‎SMP/libavfilter.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<ClCompile Include="..\libavfilter\af_chorus.c" />
154154
<ClCompile Include="..\libavfilter\af_compand.c" />
155155
<ClCompile Include="..\libavfilter\af_compensationdelay.c" />
156+
<ClCompile Include="..\libavfilter\af_crystalizer.c" />
156157
<ClCompile Include="..\libavfilter\af_dcshift.c" />
157158
<ClCompile Include="..\libavfilter\af_dynaudnorm.c" />
158159
<ClCompile Include="..\libavfilter\af_earwax.c" />

‎SMP/libavfilter.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
<ClCompile Include="..\libavfilter\af_compensationdelay.c">
280280
<Filter>Source Files\libavfilter</Filter>
281281
</ClCompile>
282+
<ClCompile Include="..\libavfilter\af_crystalizer.c">
283+
<Filter>Source Files\libavfilter</Filter>
284+
</ClCompile>
282285
<ClCompile Include="..\libavfilter\af_dcshift.c">
283286
<Filter>Source Files\libavfilter</Filter>
284287
</ClCompile>

‎SMP/libavformat.def

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ EXPORTS
3434
av_format_set_subtitle_codec
3535
av_format_set_video_codec
3636
av_get_frame_filename
37+
av_get_frame_filename2
3738
av_get_output_timestamp
3839
av_get_packet
3940
av_guess_codec

‎SMP/libavformat.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,14 @@
428428
<ClCompile Include="..\libavformat\takdec.c" />
429429
<ClCompile Include="..\libavformat\tedcaptionsdec.c" />
430430
<ClCompile Include="..\libavformat\tee.c" />
431+
<ClCompile Include="..\libavformat\tee_common.c" />
431432
<ClCompile Include="..\libavformat\thp.c" />
432433
<ClCompile Include="..\libavformat\3dostr.c" />
433434
<ClCompile Include="..\libavformat\tiertexseq.c" />
434435
<ClCompile Include="..\libavformat\mkvtimestamp_v2.c" />
435436
<ClCompile Include="..\libavformat\tmv.c" />
436437
<ClCompile Include="..\libavformat\tta.c" />
438+
<ClCompile Include="..\libavformat\ttaenc.c" />
437439
<ClCompile Include="..\libavformat\tty.c" />
438440
<ClCompile Include="..\libavformat\txd.c" />
439441
<ClCompile Include="..\libavformat\uncodedframecrcenc.c" />

‎SMP/libavformat.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,9 @@
11051105
<ClCompile Include="..\libavformat\tee.c">
11061106
<Filter>Source Files\libavformat</Filter>
11071107
</ClCompile>
1108+
<ClCompile Include="..\libavformat\tee_common.c">
1109+
<Filter>Source Files\libavformat</Filter>
1110+
</ClCompile>
11081111
<ClCompile Include="..\libavformat\thp.c">
11091112
<Filter>Source Files\libavformat</Filter>
11101113
</ClCompile>
@@ -1123,6 +1126,9 @@
11231126
<ClCompile Include="..\libavformat\tta.c">
11241127
<Filter>Source Files\libavformat</Filter>
11251128
</ClCompile>
1129+
<ClCompile Include="..\libavformat\ttaenc.c">
1130+
<Filter>Source Files\libavformat</Filter>
1131+
</ClCompile>
11261132
<ClCompile Include="..\libavformat\tty.c">
11271133
<Filter>Source Files\libavformat</Filter>
11281134
</ClCompile>

0 commit comments

Comments
 (0)