Skip to content

Commit 2fbe1f7

Browse files
SibrasSibras
committed
project: Update for upstream merge.
1 parent 18d8be0 commit 2fbe1f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+507
-470
lines changed

‎SMP/SMP.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 36a6d8482d..bcb42d47fc 100644
16+
index f3415df10b..42f36b77bb 100644
1717
--- a/libavcodec/mfenc.c
1818
+++ b/libavcodec/mfenc.c
1919
@@ -59,6 +59,10 @@ typedef struct MFContext {

‎SMP/config.asm‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -445,27 +445,27 @@
445445
%define CONFIG_MANPAGES 0
446446
%define CONFIG_PODPAGES 0
447447
%define CONFIG_TXTPAGES 0
448+
%define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0
448449
%define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
449-
%define CONFIG_AVIO_READING_EXAMPLE 0
450+
%define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0
450451
%define CONFIG_DECODE_AUDIO_EXAMPLE 0
452+
%define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0
453+
%define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0
451454
%define CONFIG_DECODE_VIDEO_EXAMPLE 0
452-
%define CONFIG_DEMUXING_DECODING_EXAMPLE 0
455+
%define CONFIG_DEMUX_DECODE_EXAMPLE 0
453456
%define CONFIG_ENCODE_AUDIO_EXAMPLE 0
454457
%define CONFIG_ENCODE_VIDEO_EXAMPLE 0
455458
%define CONFIG_EXTRACT_MVS_EXAMPLE 0
456459
%define CONFIG_FILTER_AUDIO_EXAMPLE 0
457-
%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
458-
%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
459-
%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
460460
%define CONFIG_HW_DECODE_EXAMPLE 0
461-
%define CONFIG_METADATA_EXAMPLE 0
462-
%define CONFIG_MUXING_EXAMPLE 0
463-
%define CONFIG_QSVDEC_EXAMPLE 0
464-
%define CONFIG_REMUXING_EXAMPLE 0
465-
%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
466-
%define CONFIG_SCALING_VIDEO_EXAMPLE 0
461+
%define CONFIG_MUX_EXAMPLE 0
462+
%define CONFIG_QSV_DECODE_EXAMPLE 0
463+
%define CONFIG_REMUX_EXAMPLE 0
464+
%define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0
465+
%define CONFIG_SCALE_VIDEO_EXAMPLE 0
466+
%define CONFIG_SHOW_METADATA_EXAMPLE 0
467467
%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
468-
%define CONFIG_TRANSCODING_EXAMPLE 0
468+
%define CONFIG_TRANSCODE_EXAMPLE 0
469469
%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
470470
%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
471471
%define CONFIG_QSV_TRANSCODE_EXAMPLE 0

‎SMP/config.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#endif
2929
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf"
3030
#define FFMPEG_LICENSE "GPL version 3 or later"
31-
#define CONFIG_THIS_YEAR 2022
31+
#define CONFIG_THIS_YEAR 2023
3232
#define FFMPEG_DATADIR "."
3333
#define AVCONV_DATADIR "."
3434
#if defined(__INTEL_COMPILER)
@@ -545,27 +545,27 @@
545545
#define CONFIG_MANPAGES 0
546546
#define CONFIG_PODPAGES 0
547547
#define CONFIG_TXTPAGES 0
548+
#define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0
548549
#define CONFIG_AVIO_LIST_DIR_EXAMPLE 0
549-
#define CONFIG_AVIO_READING_EXAMPLE 0
550+
#define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0
550551
#define CONFIG_DECODE_AUDIO_EXAMPLE 0
552+
#define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0
553+
#define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0
551554
#define CONFIG_DECODE_VIDEO_EXAMPLE 0
552-
#define CONFIG_DEMUXING_DECODING_EXAMPLE 0
555+
#define CONFIG_DEMUX_DECODE_EXAMPLE 0
553556
#define CONFIG_ENCODE_AUDIO_EXAMPLE 0
554557
#define CONFIG_ENCODE_VIDEO_EXAMPLE 0
555558
#define CONFIG_EXTRACT_MVS_EXAMPLE 0
556559
#define CONFIG_FILTER_AUDIO_EXAMPLE 0
557-
#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
558-
#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
559-
#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0
560560
#define CONFIG_HW_DECODE_EXAMPLE 0
561-
#define CONFIG_METADATA_EXAMPLE 0
562-
#define CONFIG_MUXING_EXAMPLE 0
563-
#define CONFIG_QSVDEC_EXAMPLE 0
564-
#define CONFIG_REMUXING_EXAMPLE 0
565-
#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
566-
#define CONFIG_SCALING_VIDEO_EXAMPLE 0
561+
#define CONFIG_MUX_EXAMPLE 0
562+
#define CONFIG_QSV_DECODE_EXAMPLE 0
563+
#define CONFIG_REMUX_EXAMPLE 0
564+
#define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0
565+
#define CONFIG_SCALE_VIDEO_EXAMPLE 0
566+
#define CONFIG_SHOW_METADATA_EXAMPLE 0
567567
#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
568-
#define CONFIG_TRANSCODING_EXAMPLE 0
568+
#define CONFIG_TRANSCODE_EXAMPLE 0
569569
#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
570570
#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
571571
#define CONFIG_QSV_TRANSCODE_EXAMPLE 0

‎SMP/config_components.h‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#define CONFIG_HEVC_METADATA_BSF 1
4242
#define CONFIG_HEVC_MP4TOANNEXB_BSF 1
4343
#define CONFIG_IMX_DUMP_HEADER_BSF 1
44+
#define CONFIG_MEDIA100_TO_MJPEGB_BSF 1
4445
#define CONFIG_MJPEG2JPEG_BSF 1
4546
#define CONFIG_MJPEGA_DUMP_HEADER_BSF 1
4647
#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1
@@ -264,6 +265,7 @@
264265
#define CONFIG_R210_DECODER 1
265266
#define CONFIG_RASC_DECODER 1
266267
#define CONFIG_RAWVIDEO_DECODER 1
268+
#define CONFIG_RKA_DECODER 1
267269
#define CONFIG_RL2_DECODER 1
268270
#define CONFIG_ROQ_DECODER 1
269271
#define CONFIG_RPZA_DECODER 1
@@ -462,6 +464,7 @@
462464
#define CONFIG_TWINVQ_DECODER 1
463465
#define CONFIG_VMDAUDIO_DECODER 1
464466
#define CONFIG_VORBIS_DECODER 1
467+
#define CONFIG_WAVARC_DECODER 1
465468
#define CONFIG_WAVPACK_DECODER 1
466469
#define CONFIG_WMALOSSLESS_DECODER 1
467470
#define CONFIG_WMAPRO_DECODER 1
@@ -506,13 +509,15 @@
506509
#define CONFIG_PCM_U32BE_DECODER 1
507510
#define CONFIG_PCM_U32LE_DECODER 1
508511
#define CONFIG_PCM_VIDC_DECODER 1
512+
#define CONFIG_CBD2_DPCM_DECODER 1
509513
#define CONFIG_DERF_DPCM_DECODER 1
510514
#define CONFIG_GREMLIN_DPCM_DECODER 1
511515
#define CONFIG_INTERPLAY_DPCM_DECODER 1
512516
#define CONFIG_ROQ_DPCM_DECODER 1
513517
#define CONFIG_SDX2_DPCM_DECODER 1
514518
#define CONFIG_SOL_DPCM_DECODER 1
515519
#define CONFIG_XAN_DPCM_DECODER 1
520+
#define CONFIG_WADY_DPCM_DECODER 1
516521
#define CONFIG_ADPCM_4XM_DECODER 1
517522
#define CONFIG_ADPCM_ADX_DECODER 1
518523
#define CONFIG_ADPCM_AFC_DECODER 1
@@ -562,6 +567,7 @@
562567
#define CONFIG_ADPCM_THP_LE_DECODER 1
563568
#define CONFIG_ADPCM_VIMA_DECODER 1
564569
#define CONFIG_ADPCM_XA_DECODER 1
570+
#define CONFIG_ADPCM_XMD_DECODER 1
565571
#define CONFIG_ADPCM_YAMAHA_DECODER 1
566572
#define CONFIG_ADPCM_ZORK_DECODER 1
567573
#define CONFIG_SSA_DECODER 1
@@ -632,6 +638,7 @@
632638
#else
633639
# define CONFIG_AV1_CUVID_DECODER 0
634640
#endif
641+
#define CONFIG_AV1_MEDIACODEC_DECODER 0
635642
#if CONFIG_LIBMFX
636643
# define CONFIG_AV1_QSV_DECODER 1
637644
#else
@@ -702,6 +709,8 @@
702709
#else
703710
# define CONFIG_VP9_QSV_DECODER 0
704711
#endif
712+
#define CONFIG_VNULL_DECODER 1
713+
#define CONFIG_ANULL_DECODER 1
705714
#define CONFIG_A64MULTI_ENCODER 1
706715
#define CONFIG_A64MULTI5_ENCODER 1
707716
#define CONFIG_ALIAS_PIX_ENCODER 1
@@ -917,8 +926,17 @@
917926
#define CONFIG_AAC_MF_ENCODER 1
918927
#define CONFIG_AC3_MF_ENCODER 1
919928
#define CONFIG_H263_V4L2M2M_ENCODER 0
920-
#define CONFIG_AV1_NVENC_ENCODER 0
929+
#if CONFIG_NVENC
930+
# define CONFIG_AV1_NVENC_ENCODER 1
931+
#else
932+
# define CONFIG_AV1_NVENC_ENCODER 0
933+
#endif
921934
#define CONFIG_AV1_QSV_ENCODER 0
935+
#if CONFIG_AMF
936+
# define CONFIG_AV1_AMF_ENCODER 1
937+
#else
938+
# define CONFIG_AV1_AMF_ENCODER 0
939+
#endif
922940
#define CONFIG_LIBOPENH264_ENCODER 0
923941
#if CONFIG_AMF
924942
# define CONFIG_H264_AMF_ENCODER 1
@@ -985,6 +1003,8 @@
9851003
#else
9861004
# define CONFIG_VP9_QSV_ENCODER 0
9871005
#endif
1006+
#define CONFIG_VNULL_ENCODER 1
1007+
#define CONFIG_ANULL_ENCODER 1
9881008
#if defined(NTDDI_WIN10_FE)
9891009
# define CONFIG_AV1_D3D11VA_HWACCEL 1
9901010
#else
@@ -1417,6 +1437,7 @@
14171437
#define CONFIG_VOLUME_FILTER 1
14181438
#define CONFIG_VOLUMEDETECT_FILTER 1
14191439
#define CONFIG_AEVALSRC_FILTER 1
1440+
#define CONFIG_AFDELAYSRC_FILTER 1
14201441
#define CONFIG_AFIRSRC_FILTER 1
14211442
#define CONFIG_ANOISESRC_FILTER 1
14221443
#define CONFIG_ANULLSRC_FILTER 1
@@ -1729,6 +1750,7 @@
17291750
#define CONFIG_SPP_FILTER 1
17301751
#define CONFIG_SR_FILTER 1
17311752
#define CONFIG_SSIM_FILTER 1
1753+
#define CONFIG_SSIM360_FILTER 1
17321754
#define CONFIG_STEREO3D_FILTER 1
17331755
#define CONFIG_STREAMSELECT_FILTER 1
17341756
#define CONFIG_SUBTITLES_FILTER 1
@@ -1797,6 +1819,24 @@
17971819
#define CONFIG_ZMQ_FILTER 0
17981820
#define CONFIG_ZOOMPAN_FILTER 1
17991821
#define CONFIG_ZSCALE_FILTER 0
1822+
#define CONFIG_HSTACK_VAAPI_FILTER 0
1823+
#define CONFIG_VSTACK_VAAPI_FILTER 0
1824+
#define CONFIG_XSTACK_VAAPI_FILTER 0
1825+
#if CONFIG_LIBMFX
1826+
# define CONFIG_HSTACK_QSV_FILTER 1
1827+
#else
1828+
# define CONFIG_HSTACK_QSV_FILTER 0
1829+
#endif
1830+
#if CONFIG_LIBMFX
1831+
# define CONFIG_VSTACK_QSV_FILTER 1
1832+
#else
1833+
# define CONFIG_VSTACK_QSV_FILTER 0
1834+
#endif
1835+
#if CONFIG_LIBMFX
1836+
# define CONFIG_XSTACK_QSV_FILTER 1
1837+
#else
1838+
# define CONFIG_XSTACK_QSV_FILTER 0
1839+
#endif
18001840
#define CONFIG_ALLRGB_FILTER 1
18011841
#define CONFIG_ALLYUV_FILTER 1
18021842
#define CONFIG_CELLAUTO_FILTER 1
@@ -2072,6 +2112,7 @@
20722112
#define CONFIG_RAWVIDEO_DEMUXER 1
20732113
#define CONFIG_REALTEXT_DEMUXER 1
20742114
#define CONFIG_REDSPARK_DEMUXER 1
2115+
#define CONFIG_RKA_DEMUXER 1
20752116
#define CONFIG_RL2_DEMUXER 1
20762117
#define CONFIG_RM_DEMUXER 1
20772118
#define CONFIG_ROQ_DEMUXER 1
@@ -2087,6 +2128,7 @@
20872128
#define CONFIG_SBG_DEMUXER 1
20882129
#define CONFIG_SCC_DEMUXER 1
20892130
#define CONFIG_SCD_DEMUXER 1
2131+
#define CONFIG_SDNS_DEMUXER 1
20902132
#define CONFIG_SDP_DEMUXER 1
20912133
#define CONFIG_SDR2_DEMUXER 1
20922134
#define CONFIG_SDS_DEMUXER 1
@@ -2138,6 +2180,8 @@
21382180
#define CONFIG_VPLAYER_DEMUXER 1
21392181
#define CONFIG_VQF_DEMUXER 1
21402182
#define CONFIG_W64_DEMUXER 1
2183+
#define CONFIG_WADY_DEMUXER 1
2184+
#define CONFIG_WAVARC_DEMUXER 1
21412185
#define CONFIG_WAV_DEMUXER 1
21422186
#define CONFIG_WC3_DEMUXER 1
21432187
#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
@@ -2150,6 +2194,7 @@
21502194
#define CONFIG_WV_DEMUXER 1
21512195
#define CONFIG_XA_DEMUXER 1
21522196
#define CONFIG_XBIN_DEMUXER 1
2197+
#define CONFIG_XMD_DEMUXER 1
21532198
#define CONFIG_XMV_DEMUXER 1
21542199
#define CONFIG_XVAG_DEMUXER 1
21552200
#define CONFIG_XWMA_DEMUXER 1
@@ -2377,6 +2422,7 @@
23772422
#define CONFIG_CONCATF_PROTOCOL 1
23782423
#define CONFIG_CRYPTO_PROTOCOL 1
23792424
#define CONFIG_DATA_PROTOCOL 1
2425+
#define CONFIG_FD_PROTOCOL 1
23802426
#define CONFIG_FFRTMPCRYPT_PROTOCOL 1
23812427
#define CONFIG_FFRTMPHTTP_PROTOCOL 1
23822428
#define CONFIG_FILE_PROTOCOL 1
@@ -2420,6 +2466,6 @@
24202466
#define CONFIG_LIBSSH_PROTOCOL 1
24212467
#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
24222468
#define CONFIG_LIBZMQ_PROTOCOL 0
2423-
#define CONFIG_IPFS_PROTOCOL 1
2424-
#define CONFIG_IPNS_PROTOCOL 1
2469+
#define CONFIG_IPFS_GATEWAY_PROTOCOL 1
2470+
#define CONFIG_IPNS_GATEWAY_PROTOCOL 1
24252471
#endif /* FFMPEG_CONFIG_COMPONENTS_H */

‎SMP/libavcodec.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ EXPORTS
120120
avcodec_flush_buffers
121121
avcodec_free_context
122122
avcodec_get_class
123-
avcodec_get_frame_class
124123
avcodec_get_hw_config
125124
avcodec_get_hw_frames_parameters
126125
avcodec_get_name

0 commit comments

Comments
 (0)