Skip to content

Commit 434b132

Browse files
SibrasSibras
committed
project: Update for recent merge.
1 parent 9045ec2 commit 434b132

28 files changed

+422
-123
lines changed

‎SMP/config.asm‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
%define ARCH_SPARC64 0
4444
%define ARCH_TILEGX 0
4545
%define ARCH_TILEPRO 0
46-
%define ARCH_TOMI 0
4746
%define ARCH_X86 1
4847
%if __BITS__ = 64
4948
%define ARCH_X86_32 0
@@ -60,6 +59,8 @@
6059
%define HAVE_ARMV6 0
6160
%define HAVE_ARMV6T2 0
6261
%define HAVE_ARMV8 0
62+
%define HAVE_DOTPROD 0
63+
%define HAVE_I8MM 0
6364
%define HAVE_NEON 0
6465
%define HAVE_VFP 0
6566
%define HAVE_VFPV3 0
@@ -109,6 +110,8 @@
109110
%define HAVE_ARMV6_EXTERNAL 0
110111
%define HAVE_ARMV6T2_EXTERNAL 0
111112
%define HAVE_ARMV8_EXTERNAL 0
113+
%define HAVE_DOTPROD_EXTERNAL 0
114+
%define HAVE_I8MM_EXTERNAL 0
112115
%define HAVE_NEON_EXTERNAL 0
113116
%define HAVE_VFP_EXTERNAL 0
114117
%define HAVE_VFPV3_EXTERNAL 0
@@ -158,6 +161,8 @@
158161
%define HAVE_ARMV6_INLINE 0
159162
%define HAVE_ARMV6T2_INLINE 0
160163
%define HAVE_ARMV8_INLINE 0
164+
%define HAVE_DOTPROD_INLINE 0
165+
%define HAVE_I8MM_INLINE 0
161166
%define HAVE_NEON_INLINE 0
162167
%define HAVE_VFP_INLINE 0
163168
%define HAVE_VFPV3_INLINE 0
@@ -233,6 +238,7 @@
233238
%define HAVE_BIGENDIAN 0
234239
%define HAVE_FAST_UNALIGNED 1
235240
%define HAVE_ARPA_INET_H 0
241+
%define HAVE_ASM_HWCAP_H 0
236242
%define HAVE_ASM_TYPES_H 0
237243
%define HAVE_CDIO_PARANOIA_H 0
238244
%define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -310,7 +316,7 @@
310316
%define HAVE_WINRT 1
311317
%define HAVE_ACCESS 1
312318
%define HAVE_ALIGNED_MALLOC 1
313-
%define HAVE_ARC4RANDOM 0
319+
%define HAVE_ARC4RANDOM_BUF 0
314320
%define HAVE_CLOCK_GETTIME 0
315321
%define HAVE_CLOSESOCKET 1
316322
%define HAVE_COMMANDLINETOARGVW 1
@@ -359,6 +365,7 @@
359365
%define HAVE_STRERROR_R 0
360366
%define HAVE_SYSCONF 0
361367
%define HAVE_SYSCTL 0
368+
%define HAVE_SYSCTLBYNAME 0
362369
%define HAVE_USLEEP 0
363370
%define HAVE_UTGETOSTYPEFROMSTRING 0
364371
%define HAVE_VIRTUALALLOC 1
@@ -372,6 +379,8 @@
372379
%define HAVE_OS2THREADS 0
373380
%define HAVE_W32THREADS 1
374381
%define HAVE_AS_ARCH_DIRECTIVE 0
382+
%define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 0
383+
%define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 0
375384
%define HAVE_AS_DN_DIRECTIVE 0
376385
%define HAVE_AS_FPU_DIRECTIVE 0
377386
%define HAVE_AS_FUNC 0
@@ -441,6 +450,7 @@
441450
%define HAVE_TEXI2HTML 0
442451
%define HAVE_XMLLINT 0
443452
%define HAVE_ZLIB_GZIP 0
453+
%define HAVE_OPENVINO2 0
444454
%define CONFIG_DOC 0
445455
%define CONFIG_HTMLPAGES 0
446456
%define CONFIG_MANPAGES 0
@@ -514,6 +524,7 @@
514524
%define CONFIG_LIBFONTCONFIG 1
515525
%define CONFIG_LIBFREETYPE 1
516526
%define CONFIG_LIBFRIBIDI 1
527+
%define CONFIG_LIBHARFBUZZ 1
517528
%define CONFIG_LIBGLSLANG 0
518529
%define CONFIG_LIBGME 1
519530
%define CONFIG_LIBGSM 0
@@ -684,6 +695,7 @@
684695
%define CONFIG_CBS_AV1 1
685696
%define CONFIG_CBS_H264 1
686697
%define CONFIG_CBS_H265 1
698+
%define CONFIG_CBS_H266 1
687699
%define CONFIG_CBS_JPEG 0
688700
%define CONFIG_CBS_MPEG2 1
689701
%define CONFIG_CBS_VP9 1
@@ -692,6 +704,7 @@
692704
%define CONFIG_DNN 1
693705
%define CONFIG_DOVI_RPU 1
694706
%define CONFIG_DVPROFILE 1
707+
%define CONFIG_EVCPARSE 1
695708
%define CONFIG_EXIF 1
696709
%define CONFIG_FAANDCT 1
697710
%define CONFIG_FAANIDCT 1

‎SMP/config.h‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# include <sdkddkver.h>
2727
# include <winapifamily.h>
2828
#endif
29-
#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"
29+
#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-libharfbuzz --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"
3131
#define CONFIG_THIS_YEAR 2023
3232
#define FFMPEG_DATADIR "."
@@ -80,7 +80,6 @@
8080
#define ARCH_SPARC64 0
8181
#define ARCH_TILEGX 0
8282
#define ARCH_TILEPRO 0
83-
#define ARCH_TOMI 0
8483
#define ARCH_X86 1
8584
#if !defined(__x86_64) && !defined(_M_X64)
8685
# define ARCH_X86_32 1
@@ -96,6 +95,8 @@
9695
#define HAVE_ARMV6 0
9796
#define HAVE_ARMV6T2 0
9897
#define HAVE_ARMV8 0
98+
#define HAVE_DOTPROD 0
99+
#define HAVE_I8MM 0
99100
#define HAVE_NEON 0
100101
#define HAVE_VFP 0
101102
#define HAVE_VFPV3 0
@@ -145,6 +146,8 @@
145146
#define HAVE_ARMV6_EXTERNAL 0
146147
#define HAVE_ARMV6T2_EXTERNAL 0
147148
#define HAVE_ARMV8_EXTERNAL 0
149+
#define HAVE_DOTPROD_EXTERNAL 0
150+
#define HAVE_I8MM_EXTERNAL 0
148151
#define HAVE_NEON_EXTERNAL 0
149152
#define HAVE_VFP_EXTERNAL 0
150153
#define HAVE_VFPV3_EXTERNAL 0
@@ -194,6 +197,8 @@
194197
#define HAVE_ARMV6_INLINE 0
195198
#define HAVE_ARMV6T2_INLINE 0
196199
#define HAVE_ARMV8_INLINE 0
200+
#define HAVE_DOTPROD_INLINE 0
201+
#define HAVE_I8MM_INLINE 0
197202
#define HAVE_NEON_INLINE 0
198203
#define HAVE_VFP_INLINE 0
199204
#define HAVE_VFPV3_INLINE 0
@@ -277,6 +282,7 @@
277282
#define HAVE_BIGENDIAN 0
278283
#define HAVE_FAST_UNALIGNED 1
279284
#define HAVE_ARPA_INET_H 0
285+
#define HAVE_ASM_HWCAP_H 0
280286
#define HAVE_ASM_TYPES_H 0
281287
#define HAVE_CDIO_PARANOIA_H 0
282288
#define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -362,7 +368,7 @@
362368
#endif
363369
#define HAVE_ACCESS 1
364370
#define HAVE_ALIGNED_MALLOC 1
365-
#define HAVE_ARC4RANDOM 0
371+
#define HAVE_ARC4RANDOM_BUF 0
366372
#define HAVE_CLOCK_GETTIME 0
367373
#define HAVE_CLOSESOCKET 1
368374
#define HAVE_COMMANDLINETOARGVW 1
@@ -435,6 +441,7 @@
435441
#define HAVE_STRERROR_R 0
436442
#define HAVE_SYSCONF 0
437443
#define HAVE_SYSCTL 0
444+
#define HAVE_SYSCTLBYNAME 0
438445
#define HAVE_USLEEP 0
439446
#define HAVE_UTGETOSTYPEFROMSTRING 0
440447
#if !HAVE_WINRT && !HAVE_UWP
@@ -452,6 +459,8 @@
452459
#define HAVE_OS2THREADS 0
453460
#define HAVE_W32THREADS 1
454461
#define HAVE_AS_ARCH_DIRECTIVE 0
462+
#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 0
463+
#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 0
455464
#define HAVE_AS_DN_DIRECTIVE 0
456465
#define HAVE_AS_FPU_DIRECTIVE 0
457466
#define HAVE_AS_FUNC 0
@@ -541,6 +550,7 @@
541550
#define HAVE_TEXI2HTML 0
542551
#define HAVE_XMLLINT 0
543552
#define HAVE_ZLIB_GZIP 0
553+
#define HAVE_OPENVINO2 0
544554
#define CONFIG_DOC 0
545555
#define CONFIG_HTMLPAGES 0
546556
#define CONFIG_MANPAGES 0
@@ -614,6 +624,7 @@
614624
#define CONFIG_LIBFONTCONFIG 1
615625
#define CONFIG_LIBFREETYPE 1
616626
#define CONFIG_LIBFRIBIDI 1
627+
#define CONFIG_LIBHARFBUZZ 1
617628
#define CONFIG_LIBGLSLANG 0
618629
#define CONFIG_LIBGME 1
619630
#define CONFIG_LIBGSM 0
@@ -832,6 +843,7 @@
832843
#define CONFIG_CBS_AV1 1
833844
#define CONFIG_CBS_H264 1
834845
#define CONFIG_CBS_H265 1
846+
#define CONFIG_CBS_H266 1
835847
#define CONFIG_CBS_JPEG 0
836848
#define CONFIG_CBS_MPEG2 1
837849
#define CONFIG_CBS_VP9 1
@@ -840,6 +852,7 @@
840852
#define CONFIG_DNN 1
841853
#define CONFIG_DOVI_RPU 1
842854
#define CONFIG_DVPROFILE 1
855+
#define CONFIG_EVCPARSE 1
843856
#define CONFIG_EXIF 1
844857
#define CONFIG_FAANDCT 1
845858
#define CONFIG_FAANIDCT 1

0 commit comments

Comments
 (0)