project: Update for 7.1 merge.

SMP/SMP.patch

@@ -1,22 +1,83 @@
-diff --git a/fftools/opt_common.c b/fftools/opt_common.c
-index 9d2d5184a0..4f0a8d59ce 100644
---- a/fftools/opt_common.c
-+++ b/fftools/opt_common.c
-@@ -48,6 +48,9 @@
- #include "libavformat/avformat.h"
- #include "libavformat/version.h"
+diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
+index 733d551fa4..24800ab676 100644
+--- a/fftools/ffmpeg.h
++++ b/fftools/ffmpeg.h
+@@ -831,7 +831,7 @@ int dec_create(const OptionsContext *o, const char *arg, Scheduler *sch);
+  * @retval ">=0" non-negative scheduler index on success
+  * @retval "<0"  an error code on failure
+  */
+-int dec_init(Decoder **pdec, Scheduler *sch,
++int dec_open(Decoder **pdec, Scheduler *sch,
+              AVDictionary **dec_opts, const DecoderOpts *o,
+              AVFrame *param_out);
+ void dec_free(Decoder **pdec);
+diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
+index 2723a0312e..bd8c5c2ee4 100644
+--- a/fftools/ffmpeg_dec.c
++++ b/fftools/ffmpeg_dec.c
+@@ -829,7 +829,7 @@ static int packet_decode(DecoderPriv *dp, AVPacket *pkt, AVFrame *frame)
+     }
+ }
 
-+#include "libavfilter/avfilter.h"
-+#include "libavfilter/version.h"
-+
- #include "libavdevice/avdevice.h"
- #include "libavdevice/version.h"
+-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
++static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts,
+                     const DecoderOpts *o, AVFrame *param_out);
+
+ static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt)
+@@ -864,7 +864,7 @@ static int dec_standalone_open(DecoderPriv *dp, const AVPacket *pkt)
+     snprintf(name, sizeof(name), "dec%d", dp->index);
+     o.name = name;
+
+-    return dec_open(dp, &dp->standalone_init.opts, &o, NULL);
++    return dec_open2(dp, &dp->standalone_init.opts, &o, NULL);
+ }
+
+ static void dec_thread_set_name(const DecoderPriv *dp)
+@@ -1519,7 +1519,7 @@ static int hw_device_setup_for_decode(DecoderPriv *dp,
+     return 0;
+ }
+
+-static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
++static int dec_open2(DecoderPriv *dp, AVDictionary **dec_opts,
+                     const DecoderOpts *o, AVFrame *param_out)
+ {
+     const AVCodec *codec = o->codec;
+@@ -1644,7 +1644,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts,
+     return 0;
+ }
+
+-int dec_init(Decoder **pdec, Scheduler *sch,
++int dec_open(Decoder **pdec, Scheduler *sch,
+              AVDictionary **dec_opts, const DecoderOpts *o,
+              AVFrame *param_out)
+ {
+@@ -1659,7 +1659,7 @@ int dec_init(Decoder **pdec, Scheduler *sch,
+
+     multiview_check_manual(dp, *dec_opts);
+
+-    ret = dec_open(dp, dec_opts, o, param_out);
++    ret = dec_open2(dp, dec_opts, o, param_out);
+     if (ret < 0)
+         goto fail;
+
+diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
+index 13aef15eab..5b3c3b588a 100644
+--- a/fftools/ffmpeg_demux.c
++++ b/fftools/ffmpeg_demux.c
+@@ -948,7 +948,7 @@ static int ist_use(InputStream *ist, int decoding_needed,
+         if (!ds->decoded_params)
+             return AVERROR(ENOMEM);
 
+-        ret = dec_init(&ist->decoder, d->sch,
++        ret = dec_open(&ist->decoder, d->sch,
+                        &ds->decoder_opts, &ds->dec_opts, ds->decoded_params);
+         if (ret < 0)
+             return ret;
 diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c
-index a674a35aa4..d7a52378b5 100644
+index b8f8a25f43..323b39267d 100644
 --- a/libavcodec/mfenc.c
 +++ b/libavcodec/mfenc.c
-@@ -59,6 +59,10 @@ typedef struct MFContext {
+@@ -60,6 +60,10 @@ typedef struct MFContext {
  static int mf_choose_output_type(AVCodecContext *avctx);
  static int mf_setup_context(AVCodecContext *avctx);
 
@@ -28,18 +89,18 @@ index a674a35aa4..d7a52378b5 100644
  // Sentinel value only used by us.
  #define MF_INVALID_TIME AV_NOPTS_VALUE
 diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c
-index ef658d04a2..3ecce972f2 100644
+index e6b5239b20..1693b04678 100644
 --- a/libavfilter/textutils.c
 +++ b/libavfilter/textutils.c
-@@ -30,6 +30,7 @@
- #include "libavutil/error.h"
+@@ -31,6 +31,7 @@
  #include "libavutil/file.h"
+ #include "libavutil/mem.h"
  #include "libavutil/time.h"
 +#include "libavutil/time_internal.h"
 
  static int ff_expand_text_function_internal(FFExpandTextContext *expand_text, AVBPrint *bp,
                                              char *name, unsigned argc, char **argv)
-@@ -189,7 +190,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta,
+@@ -190,7 +191,7 @@ int ff_print_pts(void *log_ctx, AVBPrint *bp, double pts, const char *delta,
          if (!strcmp(fmt, "localtime"))
              localtime_r(&ms, &tm);
          else
@@ -48,7 +109,7 @@ index ef658d04a2..3ecce972f2 100644
          av_bprint_strftime(bp, av_x_if_null(strftime_fmt, "%Y-%m-%d %H:%M:%S"), &tm);
      } else {
          av_log(log_ctx, AV_LOG_ERROR, "Invalid format '%s'\n", fmt);
-@@ -219,7 +220,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp,
+@@ -220,7 +221,7 @@ int ff_print_time(void *log_ctx, AVBPrint *bp,
      if (localtime)
          localtime_r(&now, &tm);
      else

SMP/appveyor.yml

@@ -16,8 +16,6 @@ environment:
   GITHUBTOKEN:
     secure: c9Sads7Y16h7FP+LrR3IjVygYAgh8GByE8TtazxDg7jpPVxc+XDV81z7MoUc2Ada
   matrix:
-  - MSVC_VER: 15
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - MSVC_VER: 16
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
   - MSVC_VER: 17

SMP/config.asm

@@ -20,12 +20,7 @@
 ;******
 
 %define ARCH_AARCH64 0
-%define ARCH_ALPHA 0
 %define ARCH_ARM 0
-%define ARCH_AVR32 0
-%define ARCH_AVR32_AP 0
-%define ARCH_AVR32_UC 0
-%define ARCH_BFIN 0
 %define ARCH_IA64 0
 %define ARCH_LOONGARCH 0
 %define ARCH_LOONGARCH32 0
@@ -38,7 +33,6 @@
 %define ARCH_PPC64 0
 %define ARCH_RISCV 0
 %define ARCH_S390 0
-%define ARCH_SH4 0
 %define ARCH_SPARC 0
 %define ARCH_SPARC64 0
 %define ARCH_TILEGX 0
@@ -73,6 +67,8 @@
 %define HAVE_VSX 0
 %define HAVE_RV 0
 %define HAVE_RVV 0
+%define HAVE_RV_ZICBOP 0
+%define HAVE_RV_ZVBB 0
 %define HAVE_AESNI 1
 %define HAVE_AMD3DNOW 1
 %define HAVE_AMD3DNOWEXT 1
@@ -124,6 +120,8 @@
 %define HAVE_VSX_EXTERNAL 0
 %define HAVE_RV_EXTERNAL 0
 %define HAVE_RVV_EXTERNAL 0
+%define HAVE_RV_ZICBOP_EXTERNAL 0
+%define HAVE_RV_ZVBB_EXTERNAL 0
 %define HAVE_AESNI_EXTERNAL 1
 %define HAVE_AMD3DNOW_EXTERNAL 1
 %define HAVE_AMD3DNOWEXT_EXTERNAL 1
@@ -175,6 +173,8 @@
 %define HAVE_VSX_INLINE 0
 %define HAVE_RV_INLINE 0
 %define HAVE_RVV_INLINE 0
+%define HAVE_RV_ZICBOP_INLINE 0
+%define HAVE_RV_ZVBB_INLINE 0
 %define HAVE_AESNI_INLINE 1
 %define HAVE_AMD3DNOW_INLINE 1
 %define HAVE_AMD3DNOWEXT_INLINE 1
@@ -225,19 +225,17 @@
 %define HAVE_SIMD_ALIGN_16 1
 %define HAVE_SIMD_ALIGN_32 1
 %define HAVE_SIMD_ALIGN_64 1
-%define HAVE_ATOMIC_CAS_PTR 0
-%define HAVE_MACHINE_RW_BARRIER 0
 %define HAVE_MEMORYBARRIER 1
 %define HAVE_MM_EMPTY 1
 %define HAVE_RDTSC 1
 %define HAVE_SEM_TIMEDWAIT 0
-%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 0
 %define HAVE_INLINE_ASM 1
 %define HAVE_SYMVER 0
 %define HAVE_X86ASM 1
 %define HAVE_BIGENDIAN 0
 %define HAVE_FAST_UNALIGNED 1
 %define HAVE_ARPA_INET_H 0
+%define HAVE_ASM_HWPROBE_H 0
 %define HAVE_ASM_TYPES_H 0
 %define HAVE_CDIO_PARANOIA_H 0
 %define HAVE_CDIO_PARANOIA_PARANOIA_H 1
@@ -264,6 +262,7 @@
 %define HAVE_OPENGL_GL3_H 0
 %define HAVE_POLL_H 0
 %define HAVE_PTHREAD_NP_H 0
+%define HAVE_SYS_HWPROBE_H 0
 %define HAVE_SYS_PARAM_H 0
 %define HAVE_SYS_RESOURCE_H 0
 %define HAVE_SYS_SELECT_H 0
@@ -278,6 +277,7 @@
 %define HAVE_WINDOWS_H 1
 %define HAVE_WINSOCK2_H 1
 %define HAVE_INTRINSICS_NEON 0
+%define HAVE_INTRINSICS_SSE2 0
 %define HAVE_ATANF 1
 %define HAVE_ATAN2F 1
 %define HAVE_CBRT 1
@@ -320,6 +320,7 @@
 %define HAVE_CLOCK_GETTIME 0
 %define HAVE_CLOSESOCKET 1
 %define HAVE_COMMANDLINETOARGVW 1
+%define HAVE_ELF_AUX_INFO 0
 %define HAVE_FCNTL 0
 %define HAVE_GETADDRINFO 1
 %define HAVE_GETAUXVAL 0
@@ -368,6 +369,7 @@
 %define HAVE_SYSCONF 0
 %define HAVE_SYSCTL 0
 %define HAVE_SYSCTLBYNAME 0
+%define HAVE_TEMPNAM 0
 %define HAVE_USLEEP 0
 %define HAVE_UTGETOSTYPEFROMSTRING 0
 %define HAVE_VIRTUALALLOC 1
@@ -437,6 +439,7 @@
 %define HAVE_STRUCT_SOCKADDR_STORAGE 1
 %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
 %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
+%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
 %define HAVE_GZIP 0
 %define HAVE_LIBDRM_GETFB2 0
 %define HAVE_MAKEINFO 0
@@ -450,6 +453,7 @@
 %define HAVE_OPENCL_VIDEOTOOLBOX 0
 %define HAVE_PERL 0
 %define HAVE_POD2MAN 0
+%define HAVE_POSIX_IOCTL 0
 %define HAVE_TEXI2HTML 0
 %define HAVE_XMLLINT 0
 %define HAVE_ZLIB_GZIP 0
@@ -538,6 +542,8 @@
 %define CONFIG_LIBJXL 0
 %define CONFIG_LIBKLVANC 0
 %define CONFIG_LIBKVAZAAR 0
+%define CONFIG_LIBLC3 0
+%define CONFIG_LIBLCEVC_DEC 0
 %define CONFIG_LIBMODPLUG 1
 %define CONFIG_LIBMP3LAME 1
 %define CONFIG_LIBMYSOFA 0
@@ -575,6 +581,7 @@
 %define CONFIG_LIBVMAF 0
 %define CONFIG_LIBVORBIS 1
 %define CONFIG_LIBVPX 1
+%define CONFIG_LIBVVENC 0
 %define CONFIG_LIBWEBP 0
 %define CONFIG_LIBXEVD 0
 %define CONFIG_LIBXEVE 0
@@ -661,6 +668,7 @@
 %define CONFIG_ERROR_RESILIENCE 1
 %define CONFIG_FAAN 1
 %define CONFIG_FAST_UNALIGNED 1
+%define CONFIG_IAMF 0
 %define CONFIG_LSP 1
 %define CONFIG_PIXELUTILS 1
 %define CONFIG_NETWORK 1
@@ -706,10 +714,12 @@
 %define CONFIG_CBS_MPEG2 1
 %define CONFIG_CBS_VP8 1
 %define CONFIG_CBS_VP9 1
+%define CONFIG_D3D12VA_ENCODE 1
 %define CONFIG_DEFLATE_WRAPPER 1
 %define CONFIG_DIRAC_PARSE 1
-%define CONFIG_DNN 1
-%define CONFIG_DOVI_RPU 1
+%define CONFIG_DNN 0
+%define CONFIG_DOVI_RPUDEC 1
+%define CONFIG_DOVI_RPUENC 1
 %define CONFIG_DVPROFILE 1
 %define CONFIG_EVCPARSE 1
 %define CONFIG_EXIF 1
@@ -734,13 +744,14 @@
 %define CONFIG_HUFFMAN 1
 %define CONFIG_HUFFYUVDSP 1
 %define CONFIG_HUFFYUVENCDSP 1
-%define CONFIG_IAMFDEC 1
-%define CONFIG_IAMFENC 1
+%define CONFIG_IAMFDEC 0
+%define CONFIG_IAMFENC 0
 %define CONFIG_IDCTDSP 1
 %define CONFIG_IIRFILTER 1
 %define CONFIG_INFLATE_WRAPPER 1
 %define CONFIG_INTRAX8 1
 %define CONFIG_ISO_MEDIA 1
+%define CONFIG_ISO_WRITER 1
 %define CONFIG_IVIDSP 1
 %define CONFIG_JPEGTABLES 1
 %define CONFIG_LGPLV3 0
@@ -790,5 +801,6 @@
 %define CONFIG_VP3DSP 1
 %define CONFIG_VP56DSP 1
 %define CONFIG_VP8DSP 1
+%define CONFIG_VULKAN_ENCODE 0
 %define CONFIG_WMA_FREQS 1
 %define CONFIG_WMV2DSP 1