Skip to content

Commit 1f93f7c

Browse files
SibrasSibras
committed
projects: Update for recent merge.
1 parent a9f8c0b commit 1f93f7c

20 files changed

+138
-96
lines changed

‎SMP/SMP.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
2-
index 8a06df82df..9a31622bb4 100644
2+
index f6fe9815e1..d5d32cb89e 100644
33
--- a/fftools/opt_common.c
44
+++ b/fftools/opt_common.c
55
@@ -48,6 +48,9 @@
@@ -13,7 +13,7 @@ index 8a06df82df..9a31622bb4 100644
1313
#include "libavdevice/version.h"
1414

1515
diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
16-
index f3415df10b..42f36b77bb 100644
16+
index 8d950a3109..43ca0ead31 100644
1717
--- a/libavcodec/mfenc.c
1818
+++ b/libavcodec/mfenc.c
1919
@@ -59,6 +59,10 @@ typedef struct MFContext {

‎SMP/config.asm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@
366366
%define HAVE_BCRYPT 1
367367
%define HAVE_VAAPI_DRM 0
368368
%define HAVE_VAAPI_X11 0
369+
%define HAVE_VAAPI_WIN32 0
369370
%define HAVE_VDPAU_X11 0
370371
%define HAVE_PTHREADS 0
371372
%define HAVE_OS2THREADS 0
@@ -499,6 +500,7 @@
499500
%define CONFIG_LADSPA 0
500501
%define CONFIG_LCMS2 0
501502
%define CONFIG_LIBAOM 0
503+
%define CONFIG_LIBARIBCAPTION 0
502504
%define CONFIG_LIBASS 1
503505
%define CONFIG_LIBBLURAY 1
504506
%define CONFIG_LIBBS2B 0

‎SMP/config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@
446446
#define HAVE_BCRYPT 1
447447
#define HAVE_VAAPI_DRM 0
448448
#define HAVE_VAAPI_X11 0
449+
#define HAVE_VAAPI_WIN32 0
449450
#define HAVE_VDPAU_X11 0
450451
#define HAVE_PTHREADS 0
451452
#define HAVE_OS2THREADS 0
@@ -599,6 +600,7 @@
599600
#define CONFIG_LADSPA 0
600601
#define CONFIG_LCMS2 0
601602
#define CONFIG_LIBAOM 0
603+
#define CONFIG_LIBARIBCAPTION 0
602604
#define CONFIG_LIBASS 1
603605
#define CONFIG_LIBBLURAY 1
604606
#define CONFIG_LIBBS2B 0

‎SMP/config_components.h

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@
243243
#define CONFIG_PAM_DECODER 1
244244
#define CONFIG_PBM_DECODER 1
245245
#define CONFIG_PCX_DECODER 1
246+
#define CONFIG_PDV_DECODER 1
246247
#define CONFIG_PFM_DECODER 1
247248
#define CONFIG_PGM_DECODER 1
248249
#define CONFIG_PGMYUV_DECODER 1
@@ -607,6 +608,7 @@
607608
#define CONFIG_PCM_MULAW_AT_DECODER 0
608609
#define CONFIG_QDMC_AT_DECODER 0
609610
#define CONFIG_QDM2_AT_DECODER 0
611+
#define CONFIG_LIBARIBCAPTION_DECODER 0
610612
#define CONFIG_LIBARIBB24_DECODER 0
611613
#define CONFIG_LIBCELT_DECODER 0
612614
#define CONFIG_LIBCODEC2_DECODER 0
@@ -619,7 +621,6 @@
619621
#define CONFIG_LIBJXL_DECODER 0
620622
#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
621623
#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
622-
#define CONFIG_LIBOPENJPEG_DECODER 0
623624
#define CONFIG_LIBOPUS_DECODER 1
624625
#define CONFIG_LIBRSVG_DECODER 0
625626
#define CONFIG_LIBSPEEX_DECODER 1
@@ -926,6 +927,7 @@
926927
#define CONFIG_AAC_MF_ENCODER 1
927928
#define CONFIG_AC3_MF_ENCODER 1
928929
#define CONFIG_H263_V4L2M2M_ENCODER 0
930+
#define CONFIG_AV1_MEDIACODEC_ENCODER 0
929931
#if CONFIG_NVENC
930932
# define CONFIG_AV1_NVENC_ENCODER 1
931933
#else
@@ -992,11 +994,14 @@
992994
# define CONFIG_MPEG2_QSV_ENCODER 0
993995
#endif
994996
#define CONFIG_MPEG2_VAAPI_ENCODER 0
997+
#define CONFIG_MPEG4_MEDIACODEC_ENCODER 0
995998
#define CONFIG_MPEG4_OMX_ENCODER 0
996999
#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
9971000
#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
1001+
#define CONFIG_VP8_MEDIACODEC_ENCODER 0
9981002
#define CONFIG_VP8_V4L2M2M_ENCODER 0
9991003
#define CONFIG_VP8_VAAPI_ENCODER 0
1004+
#define CONFIG_VP9_MEDIACODEC_ENCODER 0
10001005
#define CONFIG_VP9_VAAPI_ENCODER 0
10011006
#if CONFIG_LIBMFX
10021007
# define CONFIG_VP9_QSV_ENCODER 1
@@ -1354,6 +1359,7 @@
13541359
#define CONFIG_AREALTIME_FILTER 1
13551360
#define CONFIG_ARESAMPLE_FILTER 1
13561361
#define CONFIG_AREVERSE_FILTER 1
1362+
#define CONFIG_ARLS_FILTER 1
13571363
#define CONFIG_ARNNDN_FILTER 1
13581364
#define CONFIG_ASDR_FILTER 1
13591365
#define CONFIG_ASEGMENT_FILTER 1
@@ -1438,6 +1444,7 @@
14381444
#define CONFIG_VOLUMEDETECT_FILTER 1
14391445
#define CONFIG_AEVALSRC_FILTER 1
14401446
#define CONFIG_AFDELAYSRC_FILTER 1
1447+
#define CONFIG_AFIREQSRC_FILTER 1
14411448
#define CONFIG_AFIRSRC_FILTER 1
14421449
#define CONFIG_ANOISESRC_FILTER 1
14431450
#define CONFIG_ANULLSRC_FILTER 1
@@ -1472,6 +1479,7 @@
14721479
#define CONFIG_BOXBLUR_OPENCL_FILTER 0
14731480
#define CONFIG_BWDIF_FILTER 1
14741481
#define CONFIG_CAS_FILTER 1
1482+
#define CONFIG_CCREPACK_FILTER 1
14751483
#define CONFIG_CHROMABER_VULKAN_FILTER 0
14761484
#define CONFIG_CHROMAHOLD_FILTER 1
14771485
#define CONFIG_CHROMAKEY_FILTER 1
@@ -1632,7 +1640,7 @@
16321640
#define CONFIG_MASKEDMIN_FILTER 1
16331641
#define CONFIG_MASKEDTHRESHOLD_FILTER 1
16341642
#define CONFIG_MASKFUN_FILTER 1
1635-
#define CONFIG_MCDEINT_FILTER 0
1643+
#define CONFIG_MCDEINT_FILTER 1
16361644
#define CONFIG_MEDIAN_FILTER 1
16371645
#define CONFIG_MERGEPLANES_FILTER 1
16381646
#define CONFIG_MESTIMATE_FILTER 1
@@ -1783,7 +1791,7 @@
17831791
#define CONFIG_UNSHARP_FILTER 1
17841792
#define CONFIG_UNSHARP_OPENCL_FILTER 0
17851793
#define CONFIG_UNTILE_FILTER 1
1786-
#define CONFIG_USPP_FILTER 0
1794+
#define CONFIG_USPP_FILTER 1
17871795
#define CONFIG_V360_FILTER 1
17881796
#define CONFIG_VAGUEDENOISER_FILTER 1
17891797
#define CONFIG_VARBLUR_FILTER 1
@@ -1866,6 +1874,7 @@
18661874
#define CONFIG_TESTSRC_FILTER 1
18671875
#define CONFIG_TESTSRC2_FILTER 1
18681876
#define CONFIG_YUVTESTSRC_FILTER 1
1877+
#define CONFIG_ZONEPLATE_FILTER 1
18691878
#define CONFIG_NULLSINK_FILTER 1
18701879
#define CONFIG_A3DSCOPE_FILTER 1
18711880
#define CONFIG_ABITSCOPE_FILTER 1
@@ -2102,6 +2111,7 @@
21022111
#define CONFIG_PCM_U16BE_DEMUXER 1
21032112
#define CONFIG_PCM_U16LE_DEMUXER 1
21042113
#define CONFIG_PCM_U8_DEMUXER 1
2114+
#define CONFIG_PDV_DEMUXER 1
21052115
#define CONFIG_PJS_DEMUXER 1
21062116
#define CONFIG_PMP_DEMUXER 1
21072117
#define CONFIG_PP_BNK_DEMUXER 1

‎SMP/ffmpeg.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
</ResourceCompile>
4444
</ItemGroup>
4545
<ItemGroup>
46+
<ClCompile Include="..\fftools\ffmpeg_dec.c" />
4647
<ClCompile Include="..\fftools\ffmpeg_demux.c" />
48+
<ClCompile Include="..\fftools\ffmpeg_enc.c" />
4749
<ClCompile Include="..\fftools\ffmpeg_filter.c" />
4850
<ClCompile Include="..\fftools\ffmpeg_hw.c" />
4951
<ClCompile Include="..\fftools\ffmpeg_mux.c" />

‎SMP/ffmpeg.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@
2626
</ResourceCompile>
2727
</ItemGroup>
2828
<ItemGroup>
29+
<ClCompile Include="..\fftools\ffmpeg_dec.c">
30+
<Filter>Source Files\fftools</Filter>
31+
</ClCompile>
2932
<ClCompile Include="..\fftools\ffmpeg_demux.c">
3033
<Filter>Source Files\fftools</Filter>
3134
</ClCompile>
35+
<ClCompile Include="..\fftools\ffmpeg_enc.c">
36+
<Filter>Source Files\fftools</Filter>
37+
</ClCompile>
3238
<ClCompile Include="..\fftools\ffmpeg_filter.c">
3339
<Filter>Source Files\fftools</Filter>
3440
</ClCompile>

‎SMP/libavcodec.vcxproj.filters

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,6 @@
571571
<ClCompile Include="..\libavcodec\hevc_sei.c">
572572
<Filter>Source Files\libavcodec</Filter>
573573
</ClCompile>
574-
<ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c">
575-
<Filter>Source Files\libavcodec</Filter>
576-
</ClCompile>
577574
<ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c">
578575
<Filter>Source Files\libavcodec</Filter>
579576
</ClCompile>
@@ -1657,6 +1654,9 @@
16571654
<ClCompile Include="..\libavcodec\mqcdec.c">
16581655
<Filter>Source Files\libavcodec</Filter>
16591656
</ClCompile>
1657+
<ClCompile Include="..\libavcodec\jpeg2000htdec.c">
1658+
<Filter>Source Files\libavcodec</Filter>
1659+
</ClCompile>
16601660
<ClCompile Include="..\libavcodec\jpeglsdec.c">
16611661
<Filter>Source Files\libavcodec</Filter>
16621662
</ClCompile>
@@ -1930,6 +1930,9 @@
19301930
<ClCompile Include="..\libavcodec\pcxenc.c">
19311931
<Filter>Source Files\libavcodec</Filter>
19321932
</ClCompile>
1933+
<ClCompile Include="..\libavcodec\pdvdec.c">
1934+
<Filter>Source Files\libavcodec</Filter>
1935+
</ClCompile>
19331936
<ClCompile Include="..\libavcodec\pgssubdec.c">
19341937
<Filter>Source Files\libavcodec</Filter>
19351938
</ClCompile>
@@ -2377,6 +2380,9 @@
23772380
<ClCompile Include="..\libavcodec\vp8.c">
23782381
<Filter>Source Files\libavcodec</Filter>
23792382
</ClCompile>
2383+
<ClCompile Include="..\libavcodec\vp8data.c">
2384+
<Filter>Source Files\libavcodec</Filter>
2385+
</ClCompile>
23802386
<ClCompile Include="..\libavcodec\vp9.c">
23812387
<Filter>Source Files\libavcodec</Filter>
23822388
</ClCompile>
@@ -2635,9 +2641,6 @@
26352641
<ClCompile Include="..\libavcodec\libvpxenc.c">
26362642
<Filter>Source Files\libavcodec</Filter>
26372643
</ClCompile>
2638-
<ClCompile Include="..\libavcodec\libvpx.c">
2639-
<Filter>Source Files\libavcodec</Filter>
2640-
</ClCompile>
26412644
<ClCompile Include="..\libavcodec\libx264.c">
26422645
<Filter>Source Files\libavcodec</Filter>
26432646
</ClCompile>
@@ -2665,6 +2668,9 @@
26652668
<ClCompile Include="..\libavcodec\av1_parser.c">
26662669
<Filter>Source Files\libavcodec</Filter>
26672670
</ClCompile>
2671+
<ClCompile Include="..\libavcodec\av1_parse.c">
2672+
<Filter>Source Files\libavcodec</Filter>
2673+
</ClCompile>
26682674
<ClCompile Include="..\libavcodec\avs2.c">
26692675
<Filter>Source Files\libavcodec</Filter>
26702676
</ClCompile>
@@ -2854,9 +2860,6 @@
28542860
<ClCompile Include="..\libavcodec\extract_extradata_bsf.c">
28552861
<Filter>Source Files\libavcodec</Filter>
28562862
</ClCompile>
2857-
<ClCompile Include="..\libavcodec\av1_parse.c">
2858-
<Filter>Source Files\libavcodec</Filter>
2859-
</ClCompile>
28602863
<ClCompile Include="..\libavcodec\filter_units_bsf.c">
28612864
<Filter>Source Files\libavcodec</Filter>
28622865
</ClCompile>

‎SMP/libavcodec/codec_list.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ static const FFCodec *codec_list[] = {
405405
&ff_pam_decoder,
406406
&ff_pbm_decoder,
407407
&ff_pcx_decoder,
408+
&ff_pdv_decoder,
408409
&ff_pfm_decoder,
409410
&ff_pgm_decoder,
410411
&ff_pgmyuv_decoder,

‎SMP/libavcodec_files.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@
199199
<ClCompile Include="..\libavcodec\hevc_ps.c" />
200200
<ClCompile Include="..\libavcodec\hevc_data.c" />
201201
<ClCompile Include="..\libavcodec\hevc_sei.c" />
202-
<ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c" />
203202
<ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c" />
204203
<ClCompile Include="..\libavcodec\huffman.c" />
205204
<ClCompile Include="..\libavcodec\jrevdct.c" />
@@ -561,6 +560,7 @@
561560
<ClCompile Include="..\libavcodec\jpeg2000dwt.c" />
562561
<ClCompile Include="..\libavcodec\jpeg2000dec.c" />
563562
<ClCompile Include="..\libavcodec\mqcdec.c" />
563+
<ClCompile Include="..\libavcodec\jpeg2000htdec.c" />
564564
<ClCompile Include="..\libavcodec\jpeglsdec.c" />
565565
<ClCompile Include="..\libavcodec\jpegls.c" />
566566
<ClCompile Include="..\libavcodec\jpeglsenc.c" />
@@ -652,6 +652,7 @@
652652
<ClCompile Include="..\libavcodec\pnmenc.c" />
653653
<ClCompile Include="..\libavcodec\pcx.c" />
654654
<ClCompile Include="..\libavcodec\pcxenc.c" />
655+
<ClCompile Include="..\libavcodec\pdvdec.c" />
655656
<ClCompile Include="..\libavcodec\pgssubdec.c" />
656657
<ClCompile Include="..\libavcodec\pgxdec.c" />
657658
<ClCompile Include="..\libavcodec\photocd.c" />
@@ -801,6 +802,7 @@
801802
<ClCompile Include="..\libavcodec\vpx_rac.c" />
802803
<ClCompile Include="..\libavcodec\vp6.c" />
803804
<ClCompile Include="..\libavcodec\vp8.c" />
805+
<ClCompile Include="..\libavcodec\vp8data.c" />
804806
<ClCompile Include="..\libavcodec\vp9.c" />
805807
<ClCompile Include="..\libavcodec\vp9data.c" />
806808
<ClCompile Include="..\libavcodec\vp9dsp.c" />
@@ -887,7 +889,6 @@
887889
<ClCompile Include="..\libavcodec\libvorbisenc.c" />
888890
<ClCompile Include="..\libavcodec\libvpxdec.c" />
889891
<ClCompile Include="..\libavcodec\libvpxenc.c" />
890-
<ClCompile Include="..\libavcodec\libvpx.c" />
891892
<ClCompile Include="..\libavcodec\libx264.c" />
892893
<ClCompile Include="..\libavcodec\libx265.c" />
893894
<ClCompile Include="..\libavcodec\libxvid.c" />
@@ -897,6 +898,7 @@
897898
<ClCompile Include="..\libavcodec\adx_parser.c" />
898899
<ClCompile Include="..\libavcodec\amr_parser.c" />
899900
<ClCompile Include="..\libavcodec\av1_parser.c" />
901+
<ClCompile Include="..\libavcodec\av1_parse.c" />
900902
<ClCompile Include="..\libavcodec\avs2.c" />
901903
<ClCompile Include="..\libavcodec\avs2_parser.c" />
902904
<ClCompile Include="..\libavcodec\avs3_parser.c" />
@@ -960,7 +962,6 @@
960962
<ClCompile Include="..\libavcodec\dv_error_marker_bsf.c" />
961963
<ClCompile Include="..\libavcodec\eac3_core_bsf.c" />
962964
<ClCompile Include="..\libavcodec\extract_extradata_bsf.c" />
963-
<ClCompile Include="..\libavcodec\av1_parse.c" />
964965
<ClCompile Include="..\libavcodec\filter_units_bsf.c" />
965966
<ClCompile Include="..\libavcodec\h264_metadata_bsf.c" />
966967
<ClCompile Include="..\libavcodec\h264_levels.c" />

‎SMP/libavcodec_winrt.vcxproj.filters

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,6 @@
571571
<ClCompile Include="..\libavcodec\hevc_sei.c">
572572
<Filter>Source Files\libavcodec</Filter>
573573
</ClCompile>
574-
<ClCompile Include="..\libavcodec\dynamic_hdr10_plus.c">
575-
<Filter>Source Files\libavcodec</Filter>
576-
</ClCompile>
577574
<ClCompile Include="..\libavcodec\dynamic_hdr_vivid.c">
578575
<Filter>Source Files\libavcodec</Filter>
579576
</ClCompile>
@@ -1657,6 +1654,9 @@
16571654
<ClCompile Include="..\libavcodec\mqcdec.c">
16581655
<Filter>Source Files\libavcodec</Filter>
16591656
</ClCompile>
1657+
<ClCompile Include="..\libavcodec\jpeg2000htdec.c">
1658+
<Filter>Source Files\libavcodec</Filter>
1659+
</ClCompile>
16601660
<ClCompile Include="..\libavcodec\jpeglsdec.c">
16611661
<Filter>Source Files\libavcodec</Filter>
16621662
</ClCompile>
@@ -1930,6 +1930,9 @@
19301930
<ClCompile Include="..\libavcodec\pcxenc.c">
19311931
<Filter>Source Files\libavcodec</Filter>
19321932
</ClCompile>
1933+
<ClCompile Include="..\libavcodec\pdvdec.c">
1934+
<Filter>Source Files\libavcodec</Filter>
1935+
</ClCompile>
19331936
<ClCompile Include="..\libavcodec\pgssubdec.c">
19341937
<Filter>Source Files\libavcodec</Filter>
19351938
</ClCompile>
@@ -2377,6 +2380,9 @@
23772380
<ClCompile Include="..\libavcodec\vp8.c">
23782381
<Filter>Source Files\libavcodec</Filter>
23792382
</ClCompile>
2383+
<ClCompile Include="..\libavcodec\vp8data.c">
2384+
<Filter>Source Files\libavcodec</Filter>
2385+
</ClCompile>
23802386
<ClCompile Include="..\libavcodec\vp9.c">
23812387
<Filter>Source Files\libavcodec</Filter>
23822388
</ClCompile>
@@ -2635,9 +2641,6 @@
26352641
<ClCompile Include="..\libavcodec\libvpxenc.c">
26362642
<Filter>Source Files\libavcodec</Filter>
26372643
</ClCompile>
2638-
<ClCompile Include="..\libavcodec\libvpx.c">
2639-
<Filter>Source Files\libavcodec</Filter>
2640-
</ClCompile>
26412644
<ClCompile Include="..\libavcodec\libx264.c">
26422645
<Filter>Source Files\libavcodec</Filter>
26432646
</ClCompile>
@@ -2665,6 +2668,9 @@
26652668
<ClCompile Include="..\libavcodec\av1_parser.c">
26662669
<Filter>Source Files\libavcodec</Filter>
26672670
</ClCompile>
2671+
<ClCompile Include="..\libavcodec\av1_parse.c">
2672+
<Filter>Source Files\libavcodec</Filter>
2673+
</ClCompile>
26682674
<ClCompile Include="..\libavcodec\avs2.c">
26692675
<Filter>Source Files\libavcodec</Filter>
26702676
</ClCompile>
@@ -2854,9 +2860,6 @@
28542860
<ClCompile Include="..\libavcodec\extract_extradata_bsf.c">
28552861
<Filter>Source Files\libavcodec</Filter>
28562862
</ClCompile>
2857-
<ClCompile Include="..\libavcodec\av1_parse.c">
2858-
<Filter>Source Files\libavcodec</Filter>
2859-
</ClCompile>
28602863
<ClCompile Include="..\libavcodec\filter_units_bsf.c">
28612864
<Filter>Source Files\libavcodec</Filter>
28622865
</ClCompile>

0 commit comments

Comments
 (0)