Skip to content

Commit 0bf036a

Browse files
SibrasSibras
committed
projects: Update for recent upstream merge.
1 parent 48a7b6b commit 0bf036a

17 files changed

+85
-9
lines changed

‎SMP/SMP.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
2-
index 9afaf19547..ad3dd53f08 100644
2+
index 379c167e6f..64a470ab6d 100644
33
--- a/libavcodec/libx264.c
44
+++ b/libavcodec/libx264.c
55
@@ -33,10 +33,6 @@

‎SMP/config.asm‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,7 @@
11071107
%define CONFIG_MP3ON4_DECODER 1
11081108
%define CONFIG_MPC7_DECODER 1
11091109
%define CONFIG_MPC8_DECODER 1
1110+
%define CONFIG_MSNSIREN_DECODER 1
11101111
%define CONFIG_NELLYMOSER_DECODER 1
11111112
%define CONFIG_ON2AVC_DECODER 1
11121113
%define CONFIG_OPUS_DECODER 1
@@ -1376,6 +1377,7 @@
13761377
%define CONFIG_RV20_ENCODER 1
13771378
%define CONFIG_S302M_ENCODER 1
13781379
%define CONFIG_SGI_ENCODER 1
1380+
%define CONFIG_SMC_ENCODER 1
13791381
%define CONFIG_SNOW_ENCODER 1
13801382
%define CONFIG_SPEEDHQ_ENCODER 1
13811383
%define CONFIG_SUNRAST_ENCODER 1
@@ -1699,6 +1701,7 @@
16991701
%define CONFIG_ACRUSHER_FILTER 1
17001702
%define CONFIG_ADECLICK_FILTER 1
17011703
%define CONFIG_ADECLIP_FILTER 1
1704+
%define CONFIG_ADECORRELATE_FILTER 1
17021705
%define CONFIG_ADELAY_FILTER 1
17031706
%define CONFIG_ADENORM_FILTER 1
17041707
%define CONFIG_ADERIVATIVE_FILTER 1
@@ -1732,11 +1735,13 @@
17321735
%define CONFIG_APERMS_FILTER 1
17331736
%define CONFIG_APHASER_FILTER 1
17341737
%define CONFIG_APHASESHIFT_FILTER 1
1738+
%define CONFIG_APSYCLIP_FILTER 1
17351739
%define CONFIG_APULSATOR_FILTER 1
17361740
%define CONFIG_AREALTIME_FILTER 1
17371741
%define CONFIG_ARESAMPLE_FILTER 1
17381742
%define CONFIG_AREVERSE_FILTER 1
17391743
%define CONFIG_ARNNDN_FILTER 1
1744+
%define CONFIG_ASEGMENT_FILTER 1
17401745
%define CONFIG_ASELECT_FILTER 1
17411746
%define CONFIG_ASENDCMD_FILTER 1
17421747
%define CONFIG_ASETNSAMPLES_FILTER 1
@@ -1756,6 +1761,7 @@
17561761
%define CONFIG_ASUPERPASS_FILTER 1
17571762
%define CONFIG_ASUPERSTOP_FILTER 1
17581763
%define CONFIG_ATEMPO_FILTER 1
1764+
%define CONFIG_ATILT_FILTER 1
17591765
%define CONFIG_ATRIM_FILTER 1
17601766
%define CONFIG_AXCORRELATE_FILTER 1
17611767
%define CONFIG_AZMQ_FILTER 0
@@ -1934,6 +1940,7 @@
19341940
%define CONFIG_GEQ_FILTER 1
19351941
%define CONFIG_GRADFUN_FILTER 1
19361942
%define CONFIG_GRAPHMONITOR_FILTER 1
1943+
%define CONFIG_GRAYWORLD_FILTER 1
19371944
%define CONFIG_GREYEDGE_FILTER 1
19381945
%define CONFIG_GUIDED_FILTER 1
19391946
%define CONFIG_HALDCLUT_FILTER 1
@@ -1943,6 +1950,8 @@
19431950
%define CONFIG_HQDN3D_FILTER 1
19441951
%define CONFIG_HQX_FILTER 1
19451952
%define CONFIG_HSTACK_FILTER 1
1953+
%define CONFIG_HSVHOLD_FILTER 1
1954+
%define CONFIG_HSVKEY_FILTER 1
19461955
%define CONFIG_HUE_FILTER 1
19471956
%define CONFIG_HWDOWNLOAD_FILTER 1
19481957
%define CONFIG_HWMAP_FILTER 1
@@ -2047,7 +2056,9 @@
20472056
%define CONFIG_SCALE_VULKAN_FILTER 0
20482057
%define CONFIG_SCALE2REF_FILTER 1
20492058
%define CONFIG_SCDET_FILTER 1
2059+
%define CONFIG_SCHARR_FILTER 1
20502060
%define CONFIG_SCROLL_FILTER 1
2061+
%define CONFIG_SEGMENT_FILTER 1
20512062
%define CONFIG_SELECT_FILTER 1
20522063
%define CONFIG_SELECTIVECOLOR_FILTER 1
20532064
%define CONFIG_SENDCMD_FILTER 1
@@ -2608,6 +2619,7 @@
26082619
%define CONFIG_MXF_OPATOM_MUXER 1
26092620
%define CONFIG_NULL_MUXER 1
26102621
%define CONFIG_NUT_MUXER 1
2622+
%define CONFIG_OBU_MUXER 1
26112623
%define CONFIG_OGA_MUXER 1
26122624
%define CONFIG_OGG_MUXER 1
26132625
%define CONFIG_OGV_MUXER 1

‎SMP/config.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,7 @@
11781178
#define CONFIG_MP3ON4_DECODER 1
11791179
#define CONFIG_MPC7_DECODER 1
11801180
#define CONFIG_MPC8_DECODER 1
1181+
#define CONFIG_MSNSIREN_DECODER 1
11811182
#define CONFIG_NELLYMOSER_DECODER 1
11821183
#define CONFIG_ON2AVC_DECODER 1
11831184
#define CONFIG_OPUS_DECODER 1
@@ -1447,6 +1448,7 @@
14471448
#define CONFIG_RV20_ENCODER 1
14481449
#define CONFIG_S302M_ENCODER 1
14491450
#define CONFIG_SGI_ENCODER 1
1451+
#define CONFIG_SMC_ENCODER 1
14501452
#define CONFIG_SNOW_ENCODER 1
14511453
#define CONFIG_SPEEDHQ_ENCODER 1
14521454
#define CONFIG_SUNRAST_ENCODER 1
@@ -1822,6 +1824,7 @@
18221824
#define CONFIG_ACRUSHER_FILTER 1
18231825
#define CONFIG_ADECLICK_FILTER 1
18241826
#define CONFIG_ADECLIP_FILTER 1
1827+
#define CONFIG_ADECORRELATE_FILTER 1
18251828
#define CONFIG_ADELAY_FILTER 1
18261829
#define CONFIG_ADENORM_FILTER 1
18271830
#define CONFIG_ADERIVATIVE_FILTER 1
@@ -1855,11 +1858,13 @@
18551858
#define CONFIG_APERMS_FILTER 1
18561859
#define CONFIG_APHASER_FILTER 1
18571860
#define CONFIG_APHASESHIFT_FILTER 1
1861+
#define CONFIG_APSYCLIP_FILTER 1
18581862
#define CONFIG_APULSATOR_FILTER 1
18591863
#define CONFIG_AREALTIME_FILTER 1
18601864
#define CONFIG_ARESAMPLE_FILTER 1
18611865
#define CONFIG_AREVERSE_FILTER 1
18621866
#define CONFIG_ARNNDN_FILTER 1
1867+
#define CONFIG_ASEGMENT_FILTER 1
18631868
#define CONFIG_ASELECT_FILTER 1
18641869
#define CONFIG_ASENDCMD_FILTER 1
18651870
#define CONFIG_ASETNSAMPLES_FILTER 1
@@ -1879,6 +1884,7 @@
18791884
#define CONFIG_ASUPERPASS_FILTER 1
18801885
#define CONFIG_ASUPERSTOP_FILTER 1
18811886
#define CONFIG_ATEMPO_FILTER 1
1887+
#define CONFIG_ATILT_FILTER 1
18821888
#define CONFIG_ATRIM_FILTER 1
18831889
#define CONFIG_AXCORRELATE_FILTER 1
18841890
#define CONFIG_AZMQ_FILTER 0
@@ -2057,6 +2063,7 @@
20572063
#define CONFIG_GEQ_FILTER 1
20582064
#define CONFIG_GRADFUN_FILTER 1
20592065
#define CONFIG_GRAPHMONITOR_FILTER 1
2066+
#define CONFIG_GRAYWORLD_FILTER 1
20602067
#define CONFIG_GREYEDGE_FILTER 1
20612068
#define CONFIG_GUIDED_FILTER 1
20622069
#define CONFIG_HALDCLUT_FILTER 1
@@ -2066,6 +2073,8 @@
20662073
#define CONFIG_HQDN3D_FILTER 1
20672074
#define CONFIG_HQX_FILTER 1
20682075
#define CONFIG_HSTACK_FILTER 1
2076+
#define CONFIG_HSVHOLD_FILTER 1
2077+
#define CONFIG_HSVKEY_FILTER 1
20692078
#define CONFIG_HUE_FILTER 1
20702079
#define CONFIG_HWDOWNLOAD_FILTER 1
20712080
#define CONFIG_HWMAP_FILTER 1
@@ -2170,7 +2179,9 @@
21702179
#define CONFIG_SCALE_VULKAN_FILTER 0
21712180
#define CONFIG_SCALE2REF_FILTER 1
21722181
#define CONFIG_SCDET_FILTER 1
2182+
#define CONFIG_SCHARR_FILTER 1
21732183
#define CONFIG_SCROLL_FILTER 1
2184+
#define CONFIG_SEGMENT_FILTER 1
21742185
#define CONFIG_SELECT_FILTER 1
21752186
#define CONFIG_SELECTIVECOLOR_FILTER 1
21762187
#define CONFIG_SENDCMD_FILTER 1
@@ -2731,6 +2742,7 @@
27312742
#define CONFIG_MXF_OPATOM_MUXER 1
27322743
#define CONFIG_NULL_MUXER 1
27332744
#define CONFIG_NUT_MUXER 1
2745+
#define CONFIG_OBU_MUXER 1
27342746
#define CONFIG_OGA_MUXER 1
27352747
#define CONFIG_OGG_MUXER 1
27362748
#define CONFIG_OGV_MUXER 1

‎SMP/ffmpeg.vcxproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<ClCompile Include="..\fftools\ffmpeg_opt.c" />
3939
<ClCompile Include="..\fftools\ffmpeg_filter.c" />
4040
<ClCompile Include="..\fftools\ffmpeg_hw.c" />
41-
<ClCompile Include="..\fftools\ffmpeg_qsv.c" />
4241
<ClCompile Include="..\fftools\cmdutils.c" />
4342
<ClCompile Include="..\fftools\ffmpeg.c" />
4443
</ItemGroup>

‎SMP/ffmpeg.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<ClCompile Include="..\fftools\ffmpeg_hw.c">
2828
<Filter>Source Files\fftools</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\fftools\ffmpeg_qsv.c">
31-
<Filter>Source Files\fftools</Filter>
32-
</ClCompile>
3330
<ClCompile Include="..\fftools\cmdutils.c">
3431
<Filter>Source Files\fftools</Filter>
3532
</ClCompile>

‎SMP/libavcodec.vcxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@
533533
<ClCompile Include="..\libavcodec\h264_sei.c" />
534534
<ClCompile Include="..\libavcodec\h264_slice.c" />
535535
<ClCompile Include="..\libavcodec\h264data.c" />
536+
<ClCompile Include="..\libavcodec\h274.c" />
536537
<ClCompile Include="..\libavcodec\amfenc_h264.c" />
537538
<ClCompile Include="..\libavcodec\nvenc_h264.c" />
538539
<ClCompile Include="..\libavcodec\qsvenc_h264.c" />
@@ -633,6 +634,7 @@
633634
<ClCompile Include="..\libavcodec\msmpeg4dec.c" />
634635
<ClCompile Include="..\libavcodec\msmpeg4.c" />
635636
<ClCompile Include="..\libavcodec\msmpeg4enc.c" />
637+
<ClCompile Include="..\libavcodec\siren.c" />
636638
<ClCompile Include="..\libavcodec\msp2dec.c" />
637639
<ClCompile Include="..\libavcodec\msrle.c" />
638640
<ClCompile Include="..\libavcodec\mss1.c" />
@@ -736,10 +738,10 @@
736738
<ClCompile Include="..\libavcodec\shorten.c" />
737739
<ClCompile Include="..\libavcodec\sipr.c" />
738740
<ClCompile Include="..\libavcodec\sipr16k.c" />
739-
<ClCompile Include="..\libavcodec\siren.c" />
740741
<ClCompile Include="..\libavcodec\imx.c" />
741742
<ClCompile Include="..\libavcodec\smacker.c" />
742743
<ClCompile Include="..\libavcodec\smc.c" />
744+
<ClCompile Include="..\libavcodec\smcenc.c" />
743745
<ClCompile Include="..\libavcodec\snowdec.c" />
744746
<ClCompile Include="..\libavcodec\snow.c" />
745747
<ClCompile Include="..\libavcodec\snow_dwt.c" />

‎SMP/libavcodec.vcxproj.filters‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,9 @@
14491449
<ClCompile Include="..\libavcodec\h264data.c">
14501450
<Filter>Source Files\libavcodec</Filter>
14511451
</ClCompile>
1452+
<ClCompile Include="..\libavcodec\h274.c">
1453+
<Filter>Source Files\libavcodec</Filter>
1454+
</ClCompile>
14521455
<ClCompile Include="..\libavcodec\amfenc_h264.c">
14531456
<Filter>Source Files\libavcodec</Filter>
14541457
</ClCompile>
@@ -1749,6 +1752,9 @@
17491752
<ClCompile Include="..\libavcodec\msmpeg4enc.c">
17501753
<Filter>Source Files\libavcodec</Filter>
17511754
</ClCompile>
1755+
<ClCompile Include="..\libavcodec\siren.c">
1756+
<Filter>Source Files\libavcodec</Filter>
1757+
</ClCompile>
17521758
<ClCompile Include="..\libavcodec\msp2dec.c">
17531759
<Filter>Source Files\libavcodec</Filter>
17541760
</ClCompile>
@@ -2058,9 +2064,6 @@
20582064
<ClCompile Include="..\libavcodec\sipr16k.c">
20592065
<Filter>Source Files\libavcodec</Filter>
20602066
</ClCompile>
2061-
<ClCompile Include="..\libavcodec\siren.c">
2062-
<Filter>Source Files\libavcodec</Filter>
2063-
</ClCompile>
20642067
<ClCompile Include="..\libavcodec\imx.c">
20652068
<Filter>Source Files\libavcodec</Filter>
20662069
</ClCompile>
@@ -2070,6 +2073,9 @@
20702073
<ClCompile Include="..\libavcodec\smc.c">
20712074
<Filter>Source Files\libavcodec</Filter>
20722075
</ClCompile>
2076+
<ClCompile Include="..\libavcodec\smcenc.c">
2077+
<Filter>Source Files\libavcodec</Filter>
2078+
</ClCompile>
20732079
<ClCompile Include="..\libavcodec\snowdec.c">
20742080
<Filter>Source Files\libavcodec</Filter>
20752081
</ClCompile>

‎SMP/libavcodec/codec_list.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ static const AVCodec *codec_list[] = {
8181
&ff_rv20_encoder,
8282
&ff_s302m_encoder,
8383
&ff_sgi_encoder,
84+
&ff_smc_encoder,
8485
&ff_snow_encoder,
8586
&ff_speedhq_encoder,
8687
&ff_sunrast_encoder,
@@ -532,6 +533,7 @@ static const AVCodec *codec_list[] = {
532533
&ff_mp3on4_decoder,
533534
&ff_mpc7_decoder,
534535
&ff_mpc8_decoder,
536+
&ff_msnsiren_decoder,
535537
&ff_nellymoser_decoder,
536538
&ff_on2avc_decoder,
537539
&ff_opus_decoder,

‎SMP/libavfilter.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ EXPORTS
2626
av_filter_iterate
2727
avfilter_config_links
2828
avfilter_configuration
29+
avfilter_filter_pad_count
2930
avfilter_free
3031
avfilter_get_by_name
3132
avfilter_get_class

‎SMP/libavfilter.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<ClCompile Include="..\libavfilter\af_acrusher.c" />
125125
<ClCompile Include="..\libavfilter\f_cue.c" />
126126
<ClCompile Include="..\libavfilter\af_adeclick.c" />
127+
<ClCompile Include="..\libavfilter\af_adecorrelate.c" />
127128
<ClCompile Include="..\libavfilter\af_adelay.c" />
128129
<ClCompile Include="..\libavfilter\af_adenorm.c" />
129130
<ClCompile Include="..\libavfilter\af_aderivative.c" />
@@ -153,11 +154,13 @@
153154
<ClCompile Include="..\libavfilter\f_perms.c" />
154155
<ClCompile Include="..\libavfilter\af_aphaser.c" />
155156
<ClCompile Include="..\libavfilter\generate_wave_table.c" />
157+
<ClCompile Include="..\libavfilter\af_apsyclip.c" />
156158
<ClCompile Include="..\libavfilter\af_apulsator.c" />
157159
<ClCompile Include="..\libavfilter\f_realtime.c" />
158160
<ClCompile Include="..\libavfilter\af_aresample.c" />
159161
<ClCompile Include="..\libavfilter\f_reverse.c" />
160162
<ClCompile Include="..\libavfilter\af_arnndn.c" />
163+
<ClCompile Include="..\libavfilter\f_segment.c" />
161164
<ClCompile Include="..\libavfilter\f_select.c" />
162165
<ClCompile Include="..\libavfilter\f_sendcmd.c" />
163166
<ClCompile Include="..\libavfilter\af_asetnsamples.c" />
@@ -174,6 +177,7 @@
174177
<ClCompile Include="..\libavfilter\af_asubboost.c" />
175178
<ClCompile Include="..\libavfilter\af_asupercut.c" />
176179
<ClCompile Include="..\libavfilter\af_atempo.c" />
180+
<ClCompile Include="..\libavfilter\af_atilt.c" />
177181
<ClCompile Include="..\libavfilter\trim.c" />
178182
<ClCompile Include="..\libavfilter\af_axcorrelate.c" />
179183
<ClCompile Include="..\libavfilter\af_channelmap.c" />
@@ -308,13 +312,15 @@
308312
<ClCompile Include="..\libavfilter\vf_freezeframes.c" />
309313
<ClCompile Include="..\libavfilter\vf_geq.c" />
310314
<ClCompile Include="..\libavfilter\f_graphmonitor.c" />
315+
<ClCompile Include="..\libavfilter\vf_grayworld.c" />
311316
<ClCompile Include="..\libavfilter\vf_colorconstancy.c" />
312317
<ClCompile Include="..\libavfilter\vf_guided.c" />
313318
<ClCompile Include="..\libavfilter\vf_lut3d.c" />
314319
<ClCompile Include="..\libavfilter\vf_histeq.c" />
315320
<ClCompile Include="..\libavfilter\vf_histogram.c" />
316321
<ClCompile Include="..\libavfilter\vf_hqx.c" />
317322
<ClCompile Include="..\libavfilter\vf_stack.c" />
323+
<ClCompile Include="..\libavfilter\vf_hsvkey.c" />
318324
<ClCompile Include="..\libavfilter\vf_hue.c" />
319325
<ClCompile Include="..\libavfilter\vf_hwdownload.c" />
320326
<ClCompile Include="..\libavfilter\vf_hwmap.c" />

0 commit comments

Comments
 (0)