Rebase to 6.1

2024-01-04 10:48:18 -05:00 · 2024-01-04 10:48:18 -05:00 · 37bbe8c93a
commit 37bbe8c93a
parent e691a74e2b
11 changed files with 142 additions and 5542 deletions
--- a/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
+++ b/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
@ -1,73 +0,0 @@
-From 1231003c3c6d4839a9e838d06f8e16ee7690958f Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.dev>
-Date: Mon, 13 Mar 2023 14:33:16 +0100
-Subject: [PATCH] avfilter/vf_libplacebo: remove deprecated field
-
-This has not been functional since a year ago, including in our current
-minimum dependency of libplacebo (v4.192.0). It also causes build errors
-against libplacebo v6, so it needs to be removed from the code. We can
-keep the option around for now, but it should also be removed soon.
-
-Signed-off-by: Niklas Haas <git@haasn.dev>
-Signed-off-by: James Almer <jamrial@gmail.com>
---
- doc/filters.texi            | 3 ---
- libavfilter/vf_libplacebo.c | 7 ++++---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/doc/filters.texi b/doc/filters.texi
-index 7a7b2ba4e79e..77b594f69cb1 100644
--- a/doc/filters.texi
-+++ b/doc/filters.texi
-@@ -16242,9 +16242,6 @@ Disable linear light scaling.
- @item disable_builtin
- Disable built-in GPU sampling (forces LUT).
- 
-@item force_icc_lut
-Force the use of a full ICC 3DLUT for gamut mapping.
-
- @item disable_fbos
- Forcibly disable FBOs, resulting in loss of almost all functionality, but
- offering the maximum possible speed.
-diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
-index d75723289069..757dc519e9ad 100644
--- a/libavfilter/vf_libplacebo.c
-+++ b/libavfilter/vf_libplacebo.c
-@@ -97,7 +97,6 @@ typedef struct LibplaceboContext {
-     float polar_cutoff;
-     int disable_linear;
-     int disable_builtin;
-    int force_icc_lut;
-     int force_dither;
-     int disable_fbos;
- 
-@@ -139,6 +138,7 @@ typedef struct LibplaceboContext {
-     float desat_exp;
-     int gamut_warning;
-     int gamut_clipping;
-+    int force_icc_lut;
- #endif
- 
-      /* pl_dither_params */
-@@ -463,7 +463,6 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
-         .polar_cutoff = s->polar_cutoff,
-         .disable_linear_scaling = s->disable_linear,
-         .disable_builtin_scalers = s->disable_builtin,
-        .force_icc_lut = s->force_icc_lut,
-         .force_dither = s->force_dither,
-         .disable_fbos = s->disable_fbos,
-     };
-@@ -855,7 +854,9 @@ static const AVOption libplacebo_options[] = {
-     { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
-     { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-     { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-+#if FF_API_LIBPLACEBO_OPTS
-+    { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-+#endif
-     { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-     { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-     { NULL },
-- 
-2.39.2
-
--- a/0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
+++ b/0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
@ -1,76 +0,0 @@
-From 11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.dev>
-Date: Mon, 13 Mar 2023 15:10:26 +0100
-Subject: [PATCH] avfilter/vf_libplacebo: wrap deprecated opts in FF_API define
-
-Signed-off-by: Niklas Haas <git@haasn.dev>
-Signed-off-by: James Almer <jamrial@gmail.com>
---
- libavfilter/version_major.h | 2 ++
- libavfilter/vf_libplacebo.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h
-index 899dfdb27dba..1decc4012ee0 100644
--- a/libavfilter/version_major.h
-+++ b/libavfilter/version_major.h
-@@ -35,4 +35,6 @@
-  * the public API and may change, break or disappear at any time.
-  */
- 
-+#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10)
-+
- #endif /* AVFILTER_VERSION_MAJOR_H */
-diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
-index 7cd495de2619..d75723289069 100644
--- a/libavfilter/vf_libplacebo.c
-+++ b/libavfilter/vf_libplacebo.c
-@@ -132,11 +132,14 @@ typedef struct LibplaceboContext {
-     int inverse_tonemapping;
-     float crosstalk;
-     int tonemapping_lut_size;
-+
-+#if FF_API_LIBPLACEBO_OPTS
-     /* for backwards compatibility */
-     float desat_str;
-     float desat_exp;
-     int gamut_warning;
-     int gamut_clipping;
-+#endif
- 
-      /* pl_dither_params */
-     int dithering;
-@@ -380,6 +383,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
-         pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio);
-     }
- 
-+#if FF_API_LIBPLACEBO_OPTS
-     /* backwards compatibility with older API */
-     if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) {
-         float str = s->desat_str < 0.0f ? 0.9f : s->desat_str;
-@@ -397,6 +401,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
-         gamut_mode = PL_GAMUT_WARN;
-     if (s->gamut_clipping)
-         gamut_mode = PL_GAMUT_DESATURATE;
-+#endif
- 
-     /* Update render params */
-     params = (struct pl_render_params) {
-@@ -818,11 +823,14 @@ static const AVOption libplacebo_options[] = {
-     { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-     { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC },
-     { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC },
-+
-+#if FF_API_LIBPLACEBO_OPTS
-     /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */
-     { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-     { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-     { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-     { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
-+#endif
- 
-     { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" },
-         { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" },
-- 
-2.39.2
-
--- a/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
+++ b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
@ -1,30 +0,0 @@
-From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001
-From: Jun Zhao <barryjzhao@tencent.com>
-Date: Sat, 25 Feb 2023 21:54:00 +0800
-Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the
- warning
-
-silence the warning: variable 'o' is used uninitialized whenever
-'&&' condition is false
-
-Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
- fftools/ffmpeg_filter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
-index 1f5bbf6c4d..3504a3cc0a 100644
--- a/fftools/ffmpeg_filter.c
-+++ b/fftools/ffmpeg_filter.c
-@@ -362,7 +362,7 @@ fail:
- 
- static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val)
- {
-    const AVOption *o;
-+    const AVOption *o = NULL;
-     int ret;
- 
-     ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN);
-- 
-2.41.0
-
--- a/0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
+++ b/0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
@ -0,0 +1,27 @@
+From b7c696af10784110844cc3dbe0ec21538393f309 Mon Sep 17 00:00:00 2001
+From: Lynne <dev@lynne.ee>
+Date: Sun, 3 Dec 2023 21:02:13 +0100
+Subject: [PATCH] lavc/Makefile: build vulkan decode code if vulkan_av1 has
+ been enabled
+
+Forgotten.
+---
+ libavcodec/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 748806e702..fd9883d2ca 100644
+--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
+@@ -998,7 +998,7 @@ OBJS-$(CONFIG_AV1_DXVA2_HWACCEL)          += dxva2_av1.o
+ OBJS-$(CONFIG_AV1_NVDEC_HWACCEL)          += nvdec_av1.o
+ OBJS-$(CONFIG_AV1_VAAPI_HWACCEL)          += vaapi_av1.o
+ OBJS-$(CONFIG_AV1_VDPAU_HWACCEL)          += vdpau_av1.o
+-OBJS-$(CONFIG_AV1_VULKAN_HWACCEL)         += vulkan_av1.o
+OBJS-$(CONFIG_AV1_VULKAN_HWACCEL)         += vulkan_decode.o vulkan_av1.o
+ OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
+ OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
+ OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
+-- 
+2.43.0
+
--- a/FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
+++ b/FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
--- a/ffmpeg-dlopen-openh264.patch
+++ b/ffmpeg-dlopen-openh264.patch
@ -1,7 +1,7 @@
-From 1f48740db0dda8d6ec1b97a7f4a794e381a65636 Mon Sep 17 00:00:00 2001
+From 3daa49cae0bfc3de434dd28c3a23ae877f0639db Mon Sep 17 00:00:00 2001
 From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Wed, 12 Oct 2022 09:41:27 -0400
-Subject: [PATCH] avcodec/openh264: Add the ability to dlopen() OpenH264
+Date: Thu, 4 Jan 2024 10:21:17 -0500
+Subject: [PATCH] lavc/openh264: Add the ability to dlopen() OpenH264

 We can't directly depend on OpenH264, but we can weakly link to it
 and gracefully expose the capability.
@ -24,10 +24,10 @@ Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
 create mode 100644 libavcodec/libopenh264_dlopen.h

 diff --git a/configure b/configure
-index ba5793b2ff..8855c1a908 100755
+index 1f0b9497cb..97fa4a5d6a 100755
 --- a/configure
 +++ b/configure
-@@ -251,6 +251,7 @@ External library support:
+@@ -249,6 +249,7 @@ External library support:
   --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
   --enable-libopencv       enable video filtering via libopencv [no]
   --enable-libopenh264     enable H.264 encoding via OpenH264 [no]
@ -35,7 +35,7 @@ index ba5793b2ff..8855c1a908 100755
   --enable-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
   --enable-libopenmpt      enable decoding tracked files via libopenmpt [no]
   --enable-libopenvino     enable OpenVINO as a DNN module backend
-@@ -1844,6 +1845,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1871,6 +1872,7 @@ EXTERNAL_LIBRARY_LIST="
     libmysofa
     libopencv
     libopenh264
@ -43,7 +43,7 @@ index ba5793b2ff..8855c1a908 100755
     libopenjpeg
     libopenmpt
     libopenvino
-@@ -6596,6 +6598,7 @@ enabled libopencv         && { check_headers opencv2/core/core_c.h &&
+@@ -6765,6 +6767,7 @@ enabled libopencv         && { check_headers opencv2/core/core_c.h &&
                                  require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
 enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
@ -52,17 +52,17 @@ index ba5793b2ff..8855c1a908 100755
                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
 enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 457ec58377..08a26fba5f 100644
+index 580a8d6b54..c27d229f6d 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -1075,6 +1075,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o
+@@ -1115,6 +1115,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o
 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)  += libopencore-amr.o
 OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o
 OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)  += libopencore-amr.o
 +OBJS-$(CONFIG_LIBOPENH264_DLOPEN)         += libopenh264_dlopen.o
 OBJS-$(CONFIG_LIBOPENH264_DECODER)        += libopenh264dec.o libopenh264.o
 OBJS-$(CONFIG_LIBOPENH264_ENCODER)        += libopenh264enc.o libopenh264.o
- OBJS-$(CONFIG_LIBOPENJPEG_DECODER)        += libopenjpegdec.o
+ OBJS-$(CONFIG_LIBOPENJPEG_ENCODER)        += libopenjpegenc.o
 diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
 index c80c85ea8b..128c3d9846 100644
 --- a/libavcodec/libopenh264.c
@ -299,7 +299,7 @@ index 0000000000..d7d8bb7cad
 +
 +#endif /* HAVE_LIBOPENH264_DLOPEN_H */
 diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
-index 7e14d4dd7d..a805598446 100644
+index b6a9bba2dc..e042189161 100644
 --- a/libavcodec/libopenh264dec.c
 +++ b/libavcodec/libopenh264dec.c
@@ -19,8 +19,12 @@
@ -329,7 +329,7 @@ index 7e14d4dd7d..a805598446 100644
         av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
         return AVERROR_UNKNOWN;
 diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
-index 5257906567..80481f3d0a 100644
+index 6f231d22b2..3f0e990d80 100644
 --- a/libavcodec/libopenh264enc.c
 +++ b/libavcodec/libopenh264enc.c
@@ -19,8 +19,12 @@
@ -359,5 +359,5 @@ index 5257906567..80481f3d0a 100644
         av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
         return AVERROR_UNKNOWN;
 -- 
-2.36.1
+2.43.0

--- a/ffmpeg-ge-av1-vaapi-encode-support.patch
+++ b/ffmpeg-ge-av1-vaapi-encode-support.patch
--- a/ffmpeg-new-coder-errors.patch
+++ b/ffmpeg-new-coder-errors.patch
@ -1,37 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2016-04-10 23:23:53.138440254 +0200
-
-Improve the error messages a bit to say what's really going on
-(in light of a reduced build).
-
---
- fftools/ffmpeg.c        |    2 +-
- fftools/ffmpeg_filter.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: ffmpeg-6.0/fftools/ffmpeg.c
-===================================================================
--- ffmpeg-6.0.orig/fftools/ffmpeg.c
-+++ ffmpeg-6.0/fftools/ffmpeg.c
-@@ -2797,7 +2797,7 @@ static int init_input_stream(InputStream
-     if (ist->decoding_needed) {
-         const AVCodec *codec = ist->dec;
-         if (!codec) {
-            snprintf(error, error_len, "Decoder (codec %s) not found for input stream #%d:%d",
-+            snprintf(error, error_len, "This build of ffmpeg does not include a \"%s\" decoder needed for input stream #%d:%d.",
-                     avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
-             return AVERROR(EINVAL);
-         }
-Index: ffmpeg-6.0/fftools/ffmpeg_filter.c
-===================================================================
--- ffmpeg-6.0.orig/fftools/ffmpeg_filter.c
-+++ ffmpeg-6.0/fftools/ffmpeg_filter.c
-@@ -1064,7 +1064,7 @@ static int configure_input_filter(Filter
- {
-     if (!ifilter->ist->dec) {
-         av_log(NULL, AV_LOG_ERROR,
-               "No decoder for stream #%d:%d, filtering impossible\n",
-+               "This build of ffmpeg does not have a suitable decoder for stream #%d:%d enabled, filtering impossible\n",
-                ifilter->ist->file_index, ifilter->ist->st->index);
-         return AVERROR_DECODER_NOT_FOUND;
-     }
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@ -91,8 +91,8 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}

-Version:        6.0.1
-Release:        2%{?dist}
+Version:        6.1
+Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 URL:            https://ffmpeg.org/
@ -113,32 +113,15 @@ Source93:       ffmpeg_find_free_source_headers.sh

 # Fixes for reduced codec selection on free build
 Patch1:         ffmpeg-codec-choice.patch
-# Better error messages for free build
-Patch2:         ffmpeg-new-coder-errors.patch
 # Allow to build with fdk-aac-free
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
-Patch3:         ffmpeg-allow-fdk-aac-free.patch
-# Backport upstream patches for libplacebo v5.264
-Patch4:         0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
-Patch5:         0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
-
-# Backport fix for segfault when passing non-existent filter option
-# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773
-Patch7:         0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
-
-# Backport patches for enhanced rtmp support
-# Cf. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=8926
-## From: https://patchwork.ffmpeg.org/series/8926/mbox/
-Patch8:         FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
-
-# Backport AV1 VA-API encode support
-# Courtesy of GloriousEggroll
-## Adapted from: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=9594
-Patch9:         ffmpeg-ge-av1-vaapi-encode-support.patch
-
+Patch2:         ffmpeg-allow-fdk-aac-free.patch
+# Backport fix for Vulkan Video with only AV1
+# From: https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/317728.html
+Patch3:         0001-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch
 # Drop openh264 runtime version checks
 # https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211
-Patch10:        0001-lavc-libopenh264-Drop-openh264-runtime-version-check.patch
+Patch4:         0001-lavc-libopenh264-Drop-openh264-runtime-version-check.patch

 # Set up dlopen for openh264
 Patch1001:      ffmpeg-dlopen-openh264.patch
@ -256,7 +239,7 @@ BuildRequires:  pkgconfig(vidstab)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vo-amrwbenc)
 BuildRequires:  pkgconfig(vpx)
-BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(vulkan) >= 1.3.255
 BuildRequires:  pkgconfig(wavpack)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-render)
@ -880,6 +863,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*

 %changelog
+* Thu Jan 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.1-1
+- Rebase to 6.1
+
 * Wed Dec 06 2023 Kalev Lember <klember@redhat.com> - 6.0.1-2
 - Prefer openh264 over noopenh264
 - Backport upstream patch to drop openh264 runtime version checks
--- a/161
+++ b/161
@ -29,8 +29,6 @@ doc/codecs.texi
 doc/decoders.texi
 doc/default.css
 doc/demuxers.texi
-doc/dev_community/community.md
-doc/dev_community/resolution_process.md
 doc/developer.texi
 doc/devices.texi
 doc/doxy-wrapper.sh
@ -138,7 +136,9 @@ fftools/cmdutils.c
 fftools/cmdutils.h
 fftools/ffmpeg.c
 fftools/ffmpeg.h
+fftools/ffmpeg_dec.c
 fftools/ffmpeg_demux.c
+fftools/ffmpeg_enc.c
 fftools/ffmpeg_filter.c
 fftools/ffmpeg_hw.c
 fftools/ffmpeg_mux.c
@ -212,10 +212,7 @@ libavcodec/aandcttab.h
 libavcodec/aarch64/Makefile
 libavcodec/aarch64/aacpsdsp_init_aarch64.c
 libavcodec/aarch64/aacpsdsp_neon.S
-libavcodec/aarch64/asm-offsets.h
 libavcodec/aarch64/cabac.h
-libavcodec/aarch64/fft_init_aarch64.c
-libavcodec/aarch64/fft_neon.S
 libavcodec/aarch64/fmtconvert_init.c
 libavcodec/aarch64/fmtconvert_neon.S
 libavcodec/aarch64/h264chroma_init_aarch64.c
@ -232,7 +229,6 @@ libavcodec/aarch64/hpeldsp_neon.S
 libavcodec/aarch64/idct.h
 libavcodec/aarch64/idctdsp_init_aarch64.c
 libavcodec/aarch64/idctdsp_neon.S
-libavcodec/aarch64/mdct_neon.S
 libavcodec/aarch64/me_cmp_init_aarch64.c
 libavcodec/aarch64/me_cmp_neon.S
 libavcodec/aarch64/mpegaudiodsp_init.c
@ -358,9 +354,6 @@ libavcodec/arm/blockdsp_init_neon.c
 libavcodec/arm/blockdsp_neon.S
 libavcodec/arm/cabac.h
 libavcodec/arm/dca.h
-libavcodec/arm/fft_init_arm.c
-libavcodec/arm/fft_neon.S
-libavcodec/arm/fft_vfp.S
 libavcodec/arm/flacdsp_arm.S
 libavcodec/arm/flacdsp_init_arm.c
 libavcodec/arm/fmtconvert_init_arm.c
@ -398,8 +391,6 @@ libavcodec/arm/jrevdct_arm.S
 libavcodec/arm/lossless_audiodsp_init_arm.c
 libavcodec/arm/lossless_audiodsp_neon.S
 libavcodec/arm/mathops.h
-libavcodec/arm/mdct_neon.S
-libavcodec/arm/mdct_vfp.S
 libavcodec/arm/me_cmp_armv6.S
 libavcodec/arm/me_cmp_init_arm.c
 libavcodec/arm/mlpdsp_armv5te.S
@ -419,8 +410,6 @@ libavcodec/arm/neontest.c
 libavcodec/arm/pixblockdsp_armv6.S
 libavcodec/arm/pixblockdsp_init_arm.c
 libavcodec/arm/pixblockdsp_neon.S
-libavcodec/arm/rdft_init_arm.c
-libavcodec/arm/rdft_neon.S
 libavcodec/arm/sbcdsp_armv6.S
 libavcodec/arm/sbcdsp_init_arm.c
 libavcodec/arm/sbcdsp_neon.S
@ -468,6 +457,7 @@ libavcodec/arm/vp9lpf_16bpp_neon.S
 libavcodec/arm/vp9lpf_neon.S
 libavcodec/arm/vp9mc_16bpp_neon.S
 libavcodec/arm/vp9mc_neon.S
+libavcodec/arm/vpx_arith.h
 libavcodec/ass.c
 libavcodec/ass.h
 libavcodec/ass_split.c
@ -499,6 +489,8 @@ libavcodec/aura.c
 libavcodec/av1.h
 libavcodec/av1_frame_merge_bsf.c
 libavcodec/av1_frame_split_bsf.c
+libavcodec/av1_levels.c
+libavcodec/av1_levels.h
 libavcodec/av1_metadata_bsf.c
 libavcodec/av1_parse.c
 libavcodec/av1_parse.h
@ -507,6 +499,7 @@ libavcodec/av1dec.c
 libavcodec/av1dec.h
 libavcodec/avcodec.c
 libavcodec/avcodec.h
+libavcodec/avcodec_internal.h
 libavcodec/avdct.c
 libavcodec/avdct.h
 libavcodec/avfft.c
@ -573,6 +566,8 @@ libavcodec/cbs_h2645.h
 libavcodec/cbs_h264_syntax_template.c
 libavcodec/cbs_h265.h
 libavcodec/cbs_h265_syntax_template.c
+libavcodec/cbs_h266.h
+libavcodec/cbs_h266_syntax_template.c
 libavcodec/cbs_internal.h
 libavcodec/cbs_jpeg.c
 libavcodec/cbs_jpeg.h
@ -652,7 +647,6 @@ libavcodec/dcaenc.h
 libavcodec/dcahuff.c
 libavcodec/dcahuff.h
 libavcodec/dcamath.h
-libavcodec/dct.c
 libavcodec/dct.h
 libavcodec/dct32.h
 libavcodec/dct32_fixed.c
@ -731,8 +725,6 @@ libavcodec/dvenc.c
 libavcodec/dxa.c
 libavcodec/dxtory.c
 libavcodec/dxva2.h
-libavcodec/dynamic_hdr10_plus.c
-libavcodec/dynamic_hdr10_plus.h
 libavcodec/dynamic_hdr_vivid.c
 libavcodec/dynamic_hdr_vivid.h
 libavcodec/eac3_core_bsf.c
@ -754,6 +746,13 @@ libavcodec/error_resilience.c
 libavcodec/error_resilience.h
 libavcodec/escape124.c
 libavcodec/escape130.c
+libavcodec/evc.h
+libavcodec/evc_frame_merge_bsf.c
+libavcodec/evc_parse.c
+libavcodec/evc_parse.h
+libavcodec/evc_parser.c
+libavcodec/evc_ps.c
+libavcodec/evc_ps.h
 libavcodec/evrcdata.h
 libavcodec/evrcdec.c
 libavcodec/exif.c
@ -773,13 +772,6 @@ libavcodec/fdctdsp.c
 libavcodec/fdctdsp.h
 libavcodec/fflcms2.c
 libavcodec/fflcms2.h
-libavcodec/fft-internal.h
-libavcodec/fft.h
-libavcodec/fft_fixed_32.c
-libavcodec/fft_float.c
-libavcodec/fft_init_table.c
-libavcodec/fft_table.h
-libavcodec/fft_template.c
 libavcodec/ffv1.c
 libavcodec/ffv1.h
 libavcodec/ffv1_template.c
@ -916,6 +908,7 @@ libavcodec/h264qpel_template.c
 libavcodec/h265_metadata_bsf.c
 libavcodec/h265_profile_level.c
 libavcodec/h265_profile_level.h
+libavcodec/h266_metadata_bsf.c
 libavcodec/h274.h
 libavcodec/half2float.c
 libavcodec/hap.c
@ -970,6 +963,7 @@ libavcodec/huffyuvdsp.h
 libavcodec/huffyuvenc.c
 libavcodec/huffyuvencdsp.c
 libavcodec/huffyuvencdsp.h
+libavcodec/hwaccel_internal.h
 libavcodec/hwaccels.h
 libavcodec/hwconfig.h
 libavcodec/idcinvideo.c
@ -1021,10 +1015,13 @@ libavcodec/jpeg2000.c
 libavcodec/jpeg2000.h
 libavcodec/jpeg2000_parser.c
 libavcodec/jpeg2000dec.c
+libavcodec/jpeg2000dec.h
 libavcodec/jpeg2000dsp.c
 libavcodec/jpeg2000dsp.h
 libavcodec/jpeg2000dwt.c
 libavcodec/jpeg2000dwt.h
+libavcodec/jpeg2000htdec.c
+libavcodec/jpeg2000htdec.h
 libavcodec/jpegls.c
 libavcodec/jpegls.h
 libavcodec/jpeglsdec.c
@ -1035,6 +1032,10 @@ libavcodec/jpegquanttables.h
 libavcodec/jpegtables.c
 libavcodec/jpegtables.h
 libavcodec/jpegtabs.h
+libavcodec/jpegxl.h
+libavcodec/jpegxl_parse.c
+libavcodec/jpegxl_parse.h
+libavcodec/jpegxl_parser.c
 libavcodec/jrevdct.c
 libavcodec/jvdec.c
 libavcodec/kbdwin.c
@ -1070,7 +1071,6 @@ libavcodec/libopenh264.c
 libavcodec/libopenh264.h
 libavcodec/libopenh264dec.c
 libavcodec/libopenh264enc.c
-libavcodec/libopenjpegdec.c
 libavcodec/libopenjpegenc.c
 libavcodec/libopus.c
 libavcodec/libopus.h
@ -1086,7 +1086,6 @@ libavcodec/libtwolame.c
 libavcodec/libvo-amrwbenc.c
 libavcodec/libvorbisdec.c
 libavcodec/libvorbisenc.c
-libavcodec/libvpx.c
 libavcodec/libvpx.h
 libavcodec/libvpxdec.c
 libavcodec/libvpxenc.c
@ -1117,9 +1116,6 @@ libavcodec/m101.c
 libavcodec/mace.c
 libavcodec/mathops.h
 libavcodec/mathtables.c
-libavcodec/mdct_fixed_32.c
-libavcodec/mdct_float.c
-libavcodec/mdct_template.c
 libavcodec/mdec.c
 libavcodec/me_cmp.c
 libavcodec/me_cmp.h
@ -1381,10 +1377,6 @@ libavcodec/ppc/audiodsp.c
 libavcodec/ppc/blockdsp.c
 libavcodec/ppc/fdct.h
 libavcodec/ppc/fdctdsp.c
-libavcodec/ppc/fft_altivec.S
-libavcodec/ppc/fft_init.c
-libavcodec/ppc/fft_vsx.c
-libavcodec/ppc/fft_vsx.h
 libavcodec/ppc/fmtconvert_altivec.c
 libavcodec/ppc/h264chroma_init.c
 libavcodec/ppc/h264chroma_template.c
@ -1470,15 +1462,17 @@ libavcodec/raw.c
 libavcodec/raw.h
 libavcodec/rawdec.c
 libavcodec/rawenc.c
-libavcodec/rdft.c
-libavcodec/rdft.h
 libavcodec/realtextdec.c
 libavcodec/rectangle.h
+libavcodec/refstruct.c
+libavcodec/refstruct.h
 libavcodec/remove_extradata_bsf.c
 libavcodec/reverse.c
 libavcodec/riscv/Makefile
 libavcodec/riscv/aacpsdsp_init.c
 libavcodec/riscv/aacpsdsp_rvv.S
+libavcodec/riscv/ac3dsp_init.c
+libavcodec/riscv/ac3dsp_rvb.S
 libavcodec/riscv/alacdsp_init.c
 libavcodec/riscv/alacdsp_rvv.S
 libavcodec/riscv/audiodsp_init.c
@ -1487,8 +1481,14 @@ libavcodec/riscv/audiodsp_rvv.S
 libavcodec/riscv/bswapdsp_init.c
 libavcodec/riscv/bswapdsp_rvb.S
 libavcodec/riscv/bswapdsp_rvv.S
+libavcodec/riscv/exrdsp_init.c
+libavcodec/riscv/exrdsp_rvv.S
 libavcodec/riscv/fmtconvert_init.c
 libavcodec/riscv/fmtconvert_rvv.S
+libavcodec/riscv/g722dsp_init.c
+libavcodec/riscv/g722dsp_rvv.S
+libavcodec/riscv/h264_chroma_init_riscv.c
+libavcodec/riscv/h264_mc_chroma.S
 libavcodec/riscv/idctdsp_init.c
 libavcodec/riscv/idctdsp_rvv.S
 libavcodec/riscv/opusdsp_init.c
@ -1696,6 +1696,7 @@ libavcodec/vaapi_decode.c
 libavcodec/vaapi_decode.h
 libavcodec/vaapi_encode.c
 libavcodec/vaapi_encode.h
+libavcodec/vaapi_encode_av1.c
 libavcodec/vaapi_encode_h264.c
 libavcodec/vaapi_encode_h265.c
 libavcodec/vaapi_encode_mjpeg.c
@ -1778,6 +1779,7 @@ libavcodec/vp8.c
 libavcodec/vp8.h
 libavcodec/vp89_rac.h
 libavcodec/vp8_parser.c
+libavcodec/vp8data.c
 libavcodec/vp8data.h
 libavcodec/vp8dsp.c
 libavcodec/vp8dsp.h
@ -1808,6 +1810,18 @@ libavcodec/vpx_rac.c
 libavcodec/vpx_rac.h
 libavcodec/vqavideo.c
 libavcodec/vqcdec.c
+libavcodec/vulkan.c
+libavcodec/vulkan.h
+libavcodec/vulkan_av1.c
+libavcodec/vulkan_decode.c
+libavcodec/vulkan_decode.h
+libavcodec/vulkan_video.c
+libavcodec/vulkan_video.h
+libavcodec/vulkan_video_codec_av1std.h
+libavcodec/vulkan_video_codec_av1std_decode.h
+libavcodec/vvc.h
+libavcodec/vvc_mp4toannexb_bsf.c
+libavcodec/vvc_parser.c
 libavcodec/wavarc.c
 libavcodec/wavpack.c
 libavcodec/wavpack.h
@ -1875,7 +1889,6 @@ libavcodec/x86/constants.h
 libavcodec/x86/dcadsp.asm
 libavcodec/x86/dcadsp_init.c
 libavcodec/x86/dct32.asm
-libavcodec/x86/dct_init.c
 libavcodec/x86/dirac_dwt.asm
 libavcodec/x86/dirac_dwt_init.c
 libavcodec/x86/diracdsp.asm
@ -1887,9 +1900,6 @@ libavcodec/x86/exrdsp_init.c
 libavcodec/x86/fdct.c
 libavcodec/x86/fdct.h
 libavcodec/x86/fdctdsp_init.c
-libavcodec/x86/fft.asm
-libavcodec/x86/fft.h
-libavcodec/x86/fft_init.c
 libavcodec/x86/flac_dsp_gpl.asm
 libavcodec/x86/flacdsp.asm
 libavcodec/x86/flacdsp_init.c
@ -1923,8 +1933,6 @@ libavcodec/x86/hpeldsp.asm
 libavcodec/x86/hpeldsp.h
 libavcodec/x86/hpeldsp_init.c
 libavcodec/x86/hpeldsp_rnd_template.c
-libavcodec/x86/hpeldsp_vp3.asm
-libavcodec/x86/hpeldsp_vp3_init.c
 libavcodec/x86/huffyuvdsp.asm
 libavcodec/x86/huffyuvdsp_init.c
 libavcodec/x86/huffyuvdsp_template.asm
@ -2025,6 +2033,7 @@ libavcodec/x86/vp9lpf_16bpp.asm
 libavcodec/x86/vp9mc.asm
 libavcodec/x86/vp9mc_16bpp.asm
 libavcodec/x86/vpx_arith.h
+libavcodec/x86/w64xmmtest.c
 libavcodec/x86/xvididct.asm
 libavcodec/x86/xvididct.h
 libavcodec/x86/xvididct_init.c
@ -2115,8 +2124,11 @@ libavdevice/xcbgrab.c
 libavdevice/xv.c
 libavfilter/Makefile
 libavfilter/aarch64/Makefile
+libavfilter/aarch64/vf_bwdif_init_aarch64.c
+libavfilter/aarch64/vf_bwdif_neon.S
 libavfilter/aarch64/vf_nlmeans_init.c
 libavfilter/aarch64/vf_nlmeans_neon.S
+libavfilter/adynamicequalizer_template.c
 libavfilter/aeval.c
 libavfilter/af_acontrast.c
 libavfilter/af_acopy.c
@ -2158,6 +2170,7 @@ libavfilter/af_aphaser.c
 libavfilter/af_apsyclip.c
 libavfilter/af_apulsator.c
 libavfilter/af_aresample.c
+libavfilter/af_arls.c
 libavfilter/af_arnndn.c
 libavfilter/af_asdr.c
 libavfilter/af_asetnsamples.c
@ -2257,7 +2270,10 @@ libavfilter/buffersink.c
 libavfilter/buffersink.h
 libavfilter/buffersrc.c
 libavfilter/buffersrc.h
-libavfilter/bwdif.h
+libavfilter/bwdifdsp.c
+libavfilter/bwdifdsp.h
+libavfilter/ccfifo.c
+libavfilter/ccfifo.h
 libavfilter/colorchannelmixer_template.c
 libavfilter/colorspace.c
 libavfilter/colorspace.h
@ -2270,28 +2286,6 @@ libavfilter/deshake.h
 libavfilter/dnn/Makefile
 libavfilter/dnn/dnn_backend_common.c
 libavfilter/dnn/dnn_backend_common.h
-libavfilter/dnn/dnn_backend_native.c
-libavfilter/dnn/dnn_backend_native.h
-libavfilter/dnn/dnn_backend_native_layer_avgpool.c
-libavfilter/dnn/dnn_backend_native_layer_avgpool.h
-libavfilter/dnn/dnn_backend_native_layer_conv2d.c
-libavfilter/dnn/dnn_backend_native_layer_conv2d.h
-libavfilter/dnn/dnn_backend_native_layer_dense.c
-libavfilter/dnn/dnn_backend_native_layer_dense.h
-libavfilter/dnn/dnn_backend_native_layer_depth2space.c
-libavfilter/dnn/dnn_backend_native_layer_depth2space.h
-libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
-libavfilter/dnn/dnn_backend_native_layer_mathbinary.h
-libavfilter/dnn/dnn_backend_native_layer_mathunary.c
-libavfilter/dnn/dnn_backend_native_layer_mathunary.h
-libavfilter/dnn/dnn_backend_native_layer_maximum.c
-libavfilter/dnn/dnn_backend_native_layer_maximum.h
-libavfilter/dnn/dnn_backend_native_layer_pad.c
-libavfilter/dnn/dnn_backend_native_layer_pad.h
-libavfilter/dnn/dnn_backend_native_layers.c
-libavfilter/dnn/dnn_backend_native_layers.h
-libavfilter/dnn/dnn_backend_openvino.h
-libavfilter/dnn/dnn_backend_tf.h
 libavfilter/dnn/dnn_interface.c
 libavfilter/dnn/dnn_io_proc.c
 libavfilter/dnn/dnn_io_proc.h
@ -2399,6 +2393,7 @@ libavfilter/setpts.c
 libavfilter/settb.c
 libavfilter/signature.h
 libavfilter/signature_lookup.c
+libavfilter/silenceremove_template.c
 libavfilter/split.c
 libavfilter/src_avsynctest.c
 libavfilter/src_movie.c
@ -2443,7 +2438,9 @@ libavfilter/vf_blurdetect.c
 libavfilter/vf_bm3d.c
 libavfilter/vf_boxblur.c
 libavfilter/vf_bwdif.c
+libavfilter/vf_bwdif_vulkan.c
 libavfilter/vf_cas.c
+libavfilter/vf_ccrepack.c
 libavfilter/vf_chromaber_vulkan.c
 libavfilter/vf_chromakey.c
 libavfilter/vf_chromanr.c
@ -2569,6 +2566,7 @@ libavfilter/vf_maskedmerge.c
 libavfilter/vf_maskedminmax.c
 libavfilter/vf_maskedthreshold.c
 libavfilter/vf_maskfun.c
+libavfilter/vf_mcdeint.c
 libavfilter/vf_median.c
 libavfilter/vf_mergeplanes.c
 libavfilter/vf_mestimate.c
@ -2587,6 +2585,7 @@ libavfilter/vf_nlmeans.c
 libavfilter/vf_nlmeans.h
 libavfilter/vf_nlmeans_init.h
 libavfilter/vf_nlmeans_opencl.c
+libavfilter/vf_nlmeans_vulkan.c
 libavfilter/vf_nnedi.c
 libavfilter/vf_noise.c
 libavfilter/vf_noise.h
@ -2680,6 +2679,7 @@ libavfilter/vf_transpose_vulkan.c
 libavfilter/vf_unsharp.c
 libavfilter/vf_unsharp_opencl.c
 libavfilter/vf_untile.c
+libavfilter/vf_uspp.c
 libavfilter/vf_v360.c
 libavfilter/vf_vaguedenoiser.c
 libavfilter/vf_varblur.c
@ -2699,6 +2699,7 @@ libavfilter/vf_weave.c
 libavfilter/vf_xbr.c
 libavfilter/vf_xfade.c
 libavfilter/vf_xfade_opencl.c
+libavfilter/vf_xfade_vulkan.c
 libavfilter/vf_xmedian.c
 libavfilter/vf_yadif.c
 libavfilter/vf_yaepblur.c
@ -2717,10 +2718,13 @@ libavfilter/vsrc_mandelbrot.c
 libavfilter/vsrc_mptestsrc.c
 libavfilter/vsrc_sierpinski.c
 libavfilter/vsrc_testsrc.c
+libavfilter/vsrc_testsrc_vulkan.c
 libavfilter/vulkan.c
 libavfilter/vulkan.h
 libavfilter/vulkan_filter.c
 libavfilter/vulkan_filter.h
+libavfilter/vulkan_shaderc.c
+libavfilter/vulkan_spirv.h
 libavfilter/w3fdif.h
 libavfilter/window_func.h
 libavfilter/x86/Makefile
@ -2811,6 +2815,8 @@ libavformat/aadec.c
 libavformat/aaxdec.c
 libavformat/ac3_channel_layout_tab.c
 libavformat/ac3dec.c
+libavformat/ac4dec.c
+libavformat/ac4enc.c
 libavformat/acedec.c
 libavformat/acm.c
 libavformat/act.c
@ -2942,6 +2948,9 @@ libavformat/dxa.c
 libavformat/eacdata.c
 libavformat/electronicarts.c
 libavformat/epafdec.c
+libavformat/evc.c
+libavformat/evc.h
+libavformat/evcdec.c
 libavformat/ffmeta.h
 libavformat/ffmetadec.c
 libavformat/ffmetaenc.c
@ -3050,8 +3059,8 @@ libavformat/ivfenc.c
 libavformat/jacosubdec.c
 libavformat/jacosubenc.c
 libavformat/jpegtables.c
-libavformat/jpegxl_probe.c
-libavformat/jpegxl_probe.h
+libavformat/jpegxl_anim_dec.c
+libavformat/jpegxl_parse.c
 libavformat/jvdec.c
 libavformat/kvag.c
 libavformat/lafdec.c
@ -3178,11 +3187,13 @@ libavformat/options.c
 libavformat/options_table.h
 libavformat/os_support.c
 libavformat/os_support.h
+libavformat/osq.c
 libavformat/paf.c
 libavformat/pcm.c
 libavformat/pcm.h
 libavformat/pcmdec.c
 libavformat/pcmenc.c
+libavformat/pdvdec.c
 libavformat/pjsdec.c
 libavformat/pmpdec.c
 libavformat/pp_bnk.c
@ -3195,6 +3206,7 @@ libavformat/qcp.c
 libavformat/qtpalette.c
 libavformat/qtpalette.h
 libavformat/r3d.c
+libavformat/rangecoder_dec.c
 libavformat/rawdec.c
 libavformat/rawdec.h
 libavformat/rawenc.c
@ -3380,6 +3392,7 @@ libavformat/url.c
 libavformat/url.h
 libavformat/urldecode.c
 libavformat/urldecode.h
+libavformat/usmdec.c
 libavformat/utils.c
 libavformat/vag.c
 libavformat/vapoursynth.c
@ -3403,6 +3416,7 @@ libavformat/vpcc.h
 libavformat/vpk.c
 libavformat/vplayerdec.c
 libavformat/vqf.c
+libavformat/vvcdec.c
 libavformat/w64.c
 libavformat/w64.h
 libavformat/wady.c
@ -3482,7 +3496,6 @@ libavutil/avstring.h
 libavutil/avutil.h
 libavutil/base64.c
 libavutil/base64.h
-libavutil/bfin/timer.h
 libavutil/blowfish.c
 libavutil/blowfish.h
 libavutil/bprint.c
@ -3521,12 +3534,15 @@ libavutil/dovi_meta.h
 libavutil/downmix_info.c
 libavutil/downmix_info.h
 libavutil/dynarray.h
+libavutil/emms.h
 libavutil/encryption_info.c
 libavutil/encryption_info.h
 libavutil/error.c
 libavutil/error.h
 libavutil/eval.c
 libavutil/eval.h
+libavutil/executor.c
+libavutil/executor.h
 libavutil/ffmath.h
 libavutil/fifo.c
 libavutil/fifo.h
@ -3709,12 +3725,12 @@ libavutil/version.h
 libavutil/version_major.h
 libavutil/video_enc_params.c
 libavutil/video_enc_params.h
+libavutil/video_hint.c
+libavutil/video_hint.h
 libavutil/vulkan.c
 libavutil/vulkan.h
 libavutil/vulkan_functions.h
-libavutil/vulkan_glslang.c
 libavutil/vulkan_loader.h
-libavutil/vulkan_shaderc.c
 libavutil/wchar_filename.h
 libavutil/x86/Makefile
 libavutil/x86/asm.h
@ -3723,7 +3739,6 @@ libavutil/x86/cpu.c
 libavutil/x86/cpu.h
 libavutil/x86/cpuid.asm
 libavutil/x86/emms.asm
-libavutil/x86/emms.h
 libavutil/x86/fixed_dsp.asm
 libavutil/x86/fixed_dsp_init.c
 libavutil/x86/float_dsp.asm
@ -3943,15 +3958,14 @@ tests/fate/cover-art.mak
 tests/fate/dca.mak
 tests/fate/demux.mak
 tests/fate/dfa.mak
-tests/fate/dnn.mak
 tests/fate/dnxhd.mak
 tests/fate/dpcm.mak
 tests/fate/dvvideo.mak
 tests/fate/ea.mak
+tests/fate/enc_external.mak
 tests/fate/exif.mak
 tests/fate/ffmpeg.mak
 tests/fate/ffprobe.mak
-tests/fate/fft.mak
 tests/fate/fifo-muxer.mak
 tests/fate/filter-audio.mak
 tests/fate/filter-video.mak
@ -3969,6 +3983,8 @@ tests/fate/id3v2.mak
 tests/fate/image.mak
 tests/fate/imf.mak
 tests/fate/indeo.mak
+tests/fate/jpeg2000.mak
+tests/fate/jxl.mak
 tests/fate/lavf-audio.mak
 tests/fate/lavf-container.mak
 tests/fate/lavf-image.mak
@ -4026,11 +4042,11 @@ tests/fate/wma.mak
 tests/fate/xvid.mak
 tools/Makefile
 tools/aviocat.c
-tools/cl2c
 tools/crypto_bench.c
 tools/cws2fws.c
 tools/decode_simple.c
 tools/decode_simple.h
+tools/enc_recon_frame_test.c
 tools/enum_options.c
 tools/ffescape.c
 tools/ffeval.c
@ -4045,6 +4061,7 @@ tools/scale_slice_test.c
 tools/seek_print.c
 tools/sidxindex.c
 tools/sofa2wavs.c
+tools/source2c
 tools/trasher.c
 tools/uncoded_frame.c
 tools/venc_data_dump.c
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-SHA512 (ffmpeg-free-6.0.1.tar.xz) = da4aa6db92fbbfdda9fc64249a0c826ae5de33cacbed5ebbfbbe9a30d57ae6f79b61496fcf151dc504d646efd44ba63722220be0b718dd8ffdaa5b2510d92a97
-SHA512 (ffmpeg-6.0.1.tar.xz.asc) = 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c
+SHA512 (ffmpeg-free-6.1.tar.xz) = eb2c0906b659a81f061e508b5c5004efd3fdb8299f2a5e4e954e1dd0589770baccfda768fa9d3e39bde1e1d8644c42015e0f6f674ab96a94776c69aad515d72d
+SHA512 (ffmpeg-6.1.tar.xz.asc) = e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba
 SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165