Skip to content

Commit 4ec932e

Browse files
SibrasSibras
committed
projects: Update for 7.0 merge.
1 parent cab794f commit 4ec932e

35 files changed

+655
-511
lines changed

‎SMP/config.asm

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
%define HAVE_SSE42 1
9292
%define HAVE_SSSE3 1
9393
%define HAVE_XOP 1
94-
%define HAVE_CPUNOP 0
9594
%define HAVE_I686 1
9695
%define HAVE_MIPSFPU 0
9796
%define HAVE_MIPS32R2 0
@@ -143,7 +142,6 @@
143142
%define HAVE_SSE42_EXTERNAL 1
144143
%define HAVE_SSSE3_EXTERNAL 1
145144
%define HAVE_XOP_EXTERNAL 1
146-
%define HAVE_CPUNOP_EXTERNAL 0
147145
%define HAVE_I686_EXTERNAL 1
148146
%define HAVE_MIPSFPU_EXTERNAL 0
149147
%define HAVE_MIPS32R2_EXTERNAL 0
@@ -195,7 +193,6 @@
195193
%define HAVE_SSE42_INLINE 1
196194
%define HAVE_SSSE3_INLINE 1
197195
%define HAVE_XOP_INLINE 1
198-
%define HAVE_CPUNOP_INLINE 1
199196
%define HAVE_I686_INLINE 1
200197
%define HAVE_MIPSFPU_INLINE 0
201198
%define HAVE_MIPS32R2_INLINE 0
@@ -266,6 +263,7 @@
266263
%define HAVE_OPENCV2_CORE_CORE_C_H 0
267264
%define HAVE_OPENGL_GL3_H 0
268265
%define HAVE_POLL_H 0
266+
%define HAVE_PTHREAD_NP_H 0
269267
%define HAVE_SYS_PARAM_H 0
270268
%define HAVE_SYS_RESOURCE_H 0
271269
%define HAVE_SYS_SELECT_H 0
@@ -356,6 +354,8 @@
356354
%define HAVE_POSIX_MEMALIGN 0
357355
%define HAVE_PRCTL 0
358356
%define HAVE_PTHREAD_CANCEL 0
357+
%define HAVE_PTHREAD_SET_NAME_NP 0
358+
%define HAVE_PTHREAD_SETNAME_NP 0
359359
%define HAVE_SCHED_GETAFFINITY 0
360360
%define HAVE_SECITEMIMPORT 0
361361
%define HAVE_SETCONSOLETEXTATTRIBUTE 1
@@ -447,6 +447,7 @@
447447
%define HAVE_OPENCL_DXVA2 0
448448
%define HAVE_OPENCL_VAAPI_BEIGNET 0
449449
%define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
450+
%define HAVE_OPENCL_VIDEOTOOLBOX 0
450451
%define HAVE_PERL 0
451452
%define HAVE_POD2MAN 0
452453
%define HAVE_TEXI2HTML 0
@@ -486,6 +487,8 @@
486487
%define CONFIG_FREI0R 0
487488
%define CONFIG_LIBCDIO 1
488489
%define CONFIG_LIBDAVS2 0
490+
%define CONFIG_LIBDVDNAV 0
491+
%define CONFIG_LIBDVDREAD 0
489492
%define CONFIG_LIBRUBBERBAND 0
490493
%define CONFIG_LIBVIDSTAB 0
491494
%define CONFIG_LIBX264 1
@@ -514,14 +517,13 @@
514517
%define CONFIG_LIBAOM 0
515518
%define CONFIG_LIBARIBCAPTION 0
516519
%define CONFIG_LIBASS 1
517-
%define CONFIG_LIBBLURAY 1
520+
%define CONFIG_LIBBLURAY 0
518521
%define CONFIG_LIBBS2B 0
519522
%define CONFIG_LIBCACA 0
520523
%define CONFIG_LIBCELT 0
521524
%define CONFIG_LIBCODEC2 0
522525
%define CONFIG_LIBDAV1D 0
523526
%define CONFIG_LIBDC1394 0
524-
%define CONFIG_LIBDRM 0
525527
%define CONFIG_LIBFLITE 0
526528
%define CONFIG_LIBFONTCONFIG 1
527529
%define CONFIG_LIBFREETYPE 1
@@ -547,6 +549,8 @@
547549
%define CONFIG_LIBOPUS 1
548550
%define CONFIG_LIBPLACEBO 0
549551
%define CONFIG_LIBPULSE 0
552+
%define CONFIG_LIBQRENCODE 0
553+
%define CONFIG_LIBQUIRC 0
550554
%define CONFIG_LIBRABBITMQ 0
551555
%define CONFIG_LIBRAV1E 0
552556
%define CONFIG_LIBRIST 0
@@ -564,6 +568,7 @@
564568
%define CONFIG_LIBTENSORFLOW 0
565569
%define CONFIG_LIBTESSERACT 0
566570
%define CONFIG_LIBTHEORA 1
571+
%define CONFIG_LIBTORCH 0
567572
%define CONFIG_LIBTWOLAME 0
568573
%define CONFIG_LIBUAVS3D 0
569574
%define CONFIG_LIBV4L2 0
@@ -613,14 +618,14 @@
613618
%define CONFIG_OPENCL 0
614619
%define CONFIG_AMF 1
615620
%define CONFIG_AUDIOTOOLBOX 0
616-
%define CONFIG_CRYSTALHD 0
617621
%define CONFIG_CUDA 1
618622
%define CONFIG_CUDA_LLVM 0
619623
%define CONFIG_CUVID 1
620624
%define CONFIG_D3D11VA 1
621625
%define CONFIG_D3D12VA 1
622626
%define CONFIG_DXVA2 1
623627
%define CONFIG_FFNVCODEC 1
628+
%define CONFIG_LIBDRM 0
624629
%define CONFIG_NVDEC 1
625630
%define CONFIG_NVENC 1
626631
%define CONFIG_VAAPI 0
@@ -729,6 +734,8 @@
729734
%define CONFIG_HUFFMAN 1
730735
%define CONFIG_HUFFYUVDSP 1
731736
%define CONFIG_HUFFYUVENCDSP 1
737+
%define CONFIG_IAMFDEC 1
738+
%define CONFIG_IAMFENC 1
732739
%define CONFIG_IDCTDSP 1
733740
%define CONFIG_IIRFILTER 1
734741
%define CONFIG_INFLATE_WRAPPER 1
@@ -738,6 +745,7 @@
738745
%define CONFIG_JPEGTABLES 1
739746
%define CONFIG_LGPLV3 0
740747
%define CONFIG_LIBX262 0
748+
%define CONFIG_LIBX264_HDR10 0
741749
%define CONFIG_LLAUDDSP 1
742750
%define CONFIG_LLVIDDSP 1
743751
%define CONFIG_LLVIDENCDSP 1

‎SMP/config.h

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
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-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"
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-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf"
3030
#define FFMPEG_LICENSE "GPL version 3 or later"
31-
#define CONFIG_THIS_YEAR 2023
31+
#define CONFIG_THIS_YEAR 2024
3232
#define FFMPEG_DATADIR "."
3333
#define AVCONV_DATADIR "."
3434
#if defined(__INTEL_COMPILER)
@@ -37,7 +37,6 @@
3737
# define CC_IDENT "msvc"
3838
#endif
3939
#define OS_NAME Windows
40-
#define av_restrict __restrict
4140
#if defined(__x86_64) || defined(_M_X64)
4241
# define EXTERN_PREFIX ""
4342
#else
@@ -54,7 +53,6 @@
5453
#else
5554
# define SLIBSUF ".lib"
5655
#endif
57-
#define HAVE_MMX2 HAVE_MMXEXT
5856
#define SWS_MAX_FILTER_SIZE 256
5957
#define ARCH_AARCH64 0
6058
#define ARCH_ALPHA 0
@@ -127,7 +125,6 @@
127125
#define HAVE_SSE42 1
128126
#define HAVE_SSSE3 1
129127
#define HAVE_XOP 1
130-
#define HAVE_CPUNOP 0
131128
#define HAVE_I686 1
132129
#define HAVE_MIPSFPU 0
133130
#define HAVE_MIPS32R2 0
@@ -179,7 +176,6 @@
179176
#define HAVE_SSE42_EXTERNAL 1
180177
#define HAVE_SSSE3_EXTERNAL 1
181178
#define HAVE_XOP_EXTERNAL 1
182-
#define HAVE_CPUNOP_EXTERNAL 0
183179
#define HAVE_I686_EXTERNAL 1
184180
#define HAVE_MIPSFPU_EXTERNAL 0
185181
#define HAVE_MIPS32R2_EXTERNAL 0
@@ -231,7 +227,6 @@
231227
#define HAVE_SSE42_INLINE ARCH_X86 && HAVE_INLINE_ASM
232228
#define HAVE_SSSE3_INLINE ARCH_X86 && HAVE_INLINE_ASM
233229
#define HAVE_XOP_INLINE ARCH_X86 && HAVE_INLINE_ASM
234-
#define HAVE_CPUNOP_INLINE ARCH_X86 && HAVE_INLINE_ASM
235230
#define HAVE_I686_INLINE ARCH_X86 && HAVE_INLINE_ASM
236231
#define HAVE_MIPSFPU_INLINE 0
237232
#define HAVE_MIPS32R2_INLINE 0
@@ -310,6 +305,7 @@
310305
#define HAVE_OPENCV2_CORE_CORE_C_H 0
311306
#define HAVE_OPENGL_GL3_H 0
312307
#define HAVE_POLL_H 0
308+
#define HAVE_PTHREAD_NP_H 0
313309
#define HAVE_SYS_PARAM_H 0
314310
#define HAVE_SYS_RESOURCE_H 0
315311
#define HAVE_SYS_SELECT_H 0
@@ -420,6 +416,8 @@
420416
#define HAVE_POSIX_MEMALIGN 0
421417
#define HAVE_PRCTL 0
422418
#define HAVE_PTHREAD_CANCEL 0
419+
#define HAVE_PTHREAD_SET_NAME_NP 0
420+
#define HAVE_PTHREAD_SETNAME_NP 0
423421
#define HAVE_SCHED_GETAFFINITY 0
424422
#define HAVE_SECITEMIMPORT 0
425423
#if !HAVE_WINRT && !HAVE_UWP
@@ -547,6 +545,7 @@
547545
#define HAVE_OPENCL_DXVA2 0
548546
#define HAVE_OPENCL_VAAPI_BEIGNET 0
549547
#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
548+
#define HAVE_OPENCL_VIDEOTOOLBOX 0
550549
#define HAVE_PERL 0
551550
#define HAVE_POD2MAN 0
552551
#define HAVE_TEXI2HTML 0
@@ -586,6 +585,8 @@
586585
#define CONFIG_FREI0R 0
587586
#define CONFIG_LIBCDIO 1
588587
#define CONFIG_LIBDAVS2 0
588+
#define CONFIG_LIBDVDNAV 0
589+
#define CONFIG_LIBDVDREAD 0
589590
#define CONFIG_LIBRUBBERBAND 0
590591
#define CONFIG_LIBVIDSTAB 0
591592
#define CONFIG_LIBX264 1
@@ -614,14 +615,13 @@
614615
#define CONFIG_LIBAOM 0
615616
#define CONFIG_LIBARIBCAPTION 0
616617
#define CONFIG_LIBASS 1
617-
#define CONFIG_LIBBLURAY 1
618+
#define CONFIG_LIBBLURAY 0
618619
#define CONFIG_LIBBS2B 0
619620
#define CONFIG_LIBCACA 0
620621
#define CONFIG_LIBCELT 0
621622
#define CONFIG_LIBCODEC2 0
622623
#define CONFIG_LIBDAV1D 0
623624
#define CONFIG_LIBDC1394 0
624-
#define CONFIG_LIBDRM 0
625625
#define CONFIG_LIBFLITE 0
626626
#define CONFIG_LIBFONTCONFIG 1
627627
#define CONFIG_LIBFREETYPE 1
@@ -647,6 +647,8 @@
647647
#define CONFIG_LIBOPUS 1
648648
#define CONFIG_LIBPLACEBO 0
649649
#define CONFIG_LIBPULSE 0
650+
#define CONFIG_LIBQRENCODE 0
651+
#define CONFIG_LIBQUIRC 0
650652
#define CONFIG_LIBRABBITMQ 0
651653
#define CONFIG_LIBRAV1E 0
652654
#define CONFIG_LIBRIST 0
@@ -664,6 +666,7 @@
664666
#define CONFIG_LIBTENSORFLOW 0
665667
#define CONFIG_LIBTESSERACT 0
666668
#define CONFIG_LIBTHEORA 1
669+
#define CONFIG_LIBTORCH 0
667670
#define CONFIG_LIBTWOLAME 0
668671
#define CONFIG_LIBUAVS3D 0
669672
#define CONFIG_LIBV4L2 0
@@ -725,7 +728,6 @@
725728
# define CONFIG_AMF 0
726729
#endif
727730
#define CONFIG_AUDIOTOOLBOX 0
728-
#define CONFIG_CRYSTALHD 0
729731
#if !HAVE_WINRT && !HAVE_UWP
730732
# define CONFIG_CUDA 1
731733
#else
@@ -757,6 +759,7 @@
757759
#else
758760
# define CONFIG_FFNVCODEC 0
759761
#endif
762+
#define CONFIG_LIBDRM 0
760763
#if !HAVE_WINRT && !HAVE_UWP
761764
# define CONFIG_NVDEC 1
762765
#else
@@ -881,6 +884,8 @@
881884
#define CONFIG_HUFFMAN 1
882885
#define CONFIG_HUFFYUVDSP 1
883886
#define CONFIG_HUFFYUVENCDSP 1
887+
#define CONFIG_IAMFDEC 1
888+
#define CONFIG_IAMFENC 1
884889
#define CONFIG_IDCTDSP 1
885890
#define CONFIG_IIRFILTER 1
886891
#define CONFIG_INFLATE_WRAPPER 1
@@ -890,6 +895,7 @@
890895
#define CONFIG_JPEGTABLES 1
891896
#define CONFIG_LGPLV3 0
892897
#define CONFIG_LIBX262 0
898+
#define CONFIG_LIBX264_HDR10 0
893899
#define CONFIG_LLAUDDSP 1
894900
#define CONFIG_LLVIDDSP 1
895901
#define CONFIG_LLVIDENCDSP 1

0 commit comments

Comments
 (0)