Backport upstream patch to drop openh264 runtime version checks

... in order to make it possible for us to update openh264 without having to recompile ffmpeg against the new version every time. As openh264 is distributed by Cisco and ffmpeg is in Fedora, it's difficult to coordinate lock step updates. Drop the version check to make this easier. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211 This also rebases downstream ffmpeg-dlopen-openh264.patch on top of the new patch.
Prefer openh264 over noopenh264
2023-12-08 13:09:10 -05:00 · 2023-12-08 13:09:10 -05:00 · 2023-11-11 09:53:13 -05:00 · 2023-11-11 09:46:31 -05:00 · 2023-11-10 08:18:38 -05:00 · 2023-10-09 10:04:19 +02:00
21 changed files with 10480 additions and 699 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,5 +2,3 @@ ffmpeg-*.asc
 ffmpeg-*.rpm
 ffmpeg-*.tar.xz
 /ffmpeg.keyring
-/results_*
-/*.rpm
--- a/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
+++ b/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
@ -0,0 +1,73 @@
+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
@ -0,0 +1,76 @@
+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
@ -0,0 +1,30 @@
+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-libopenh264-Drop-openh264-runtime-version-check.patch
+++ b/0001-lavc-libopenh264-Drop-openh264-runtime-version-check.patch
@ -0,0 +1,109 @@
+From a641e629591d68bd3edd99bddec623dc31295f6b Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Wed, 6 Dec 2023 14:37:34 +0100
+Subject: [PATCH] lavc/libopenh264: Drop openh264 runtime version checks
+
+Years ago, openh264 releases often changed their ABI without changing
+the library soname. To avoid running into ABI issues, a version check
+was added to lavc libopenh264 code to error out at runtime in case the
+build time and runtime openh264 versions don't match.
+
+This should no longer be an issue with newer openh264 releases and we
+can drop the runtime version check and rely on upstream doing the right
+thing and bump the library soname if the ABI changes, similar to how
+other libraries are consumed in ffmpeg.
+
+Almost all major distributions now include openh264 and this means there
+are more eyes on ABI changes and issues are discovered and reported
+quickly. See e.g. https://github.com/cisco/openh264/issues/3564 where an
+ABI issue was quickly discovered and fixed.
+
+Relaxing the check allows downstream distributions to build ffmpeg
+against e.g. openh264 2.3.1 and ship an update to ABI-compatible
+openh264 2.4.0, without needing to coordinate a lock step update between
+ffmpeg and openh264 (which can be difficult if openh264 is distributed
+by Cisco and ffmpeg comes from the distro, such as is the case for
+Fedora).
+
+Signed-off-by: Kalev Lember <klember@redhat.com>
+---
+ libavcodec/libopenh264.c    | 15 ---------------
+ libavcodec/libopenh264.h    |  2 --
+ libavcodec/libopenh264dec.c |  4 ----
+ libavcodec/libopenh264enc.c |  4 ----
+ 4 files changed, 25 deletions(-)
+
+diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
+index 0f6d28ed88..c80c85ea8b 100644
+--- a/libavcodec/libopenh264.c
+++ b/libavcodec/libopenh264.c
+@@ -46,18 +46,3 @@ void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg)
+     int equiv_ffmpeg_log_level = libopenh264_to_ffmpeg_log_level(level);
+     av_log(ctx, equiv_ffmpeg_log_level, "%s\n", msg);
+ }
+-
+-int ff_libopenh264_check_version(void *logctx)
+-{
+-    // Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
+-    // function (for functions returning larger structs), thus skip the check in those
+-    // configurations.
+-#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
+-    OpenH264Version libver = WelsGetCodecVersion();
+-    if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
+-        av_log(logctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
+-        return AVERROR(EINVAL);
+-    }
+-#endif
+-    return 0;
+-}
+diff --git a/libavcodec/libopenh264.h b/libavcodec/libopenh264.h
+index dbb9c5d429..0b462d6fdc 100644
+--- a/libavcodec/libopenh264.h
+++ b/libavcodec/libopenh264.h
+@@ -34,6 +34,4 @@
+ 
+ void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg);
+ 
+-int ff_libopenh264_check_version(void *logctx);
+-
+ #endif /* AVCODEC_LIBOPENH264_H */
+diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
+index 7d650ae03e..b6a9bba2dc 100644
+--- a/libavcodec/libopenh264dec.c
+++ b/libavcodec/libopenh264dec.c
+@@ -52,13 +52,9 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
+ {
+     SVCContext *s = avctx->priv_data;
+     SDecodingParam param = { 0 };
+-    int err;
+     int log_level;
+     WelsTraceCallback callback_function;
+ 
+-    if ((err = ff_libopenh264_check_version(avctx)) < 0)
+-        return AVERROR_DECODER_NOT_FOUND;
+-
+     if (WelsCreateDecoder(&s->decoder)) {
+         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 f518d0894e..6f231d22b2 100644
+--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
+@@ -110,14 +110,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
+ {
+     SVCContext *s = avctx->priv_data;
+     SEncParamExt param = { 0 };
+-    int err;
+     int log_level;
+     WelsTraceCallback callback_function;
+     AVCPBProperties *props;
+ 
+-    if ((err = ff_libopenh264_check_version(avctx)) < 0)
+-        return AVERROR_ENCODER_NOT_FOUND;
+-
+     if (WelsCreateSVCEncoder(&s->encoder)) {
+         av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
+         return AVERROR_UNKNOWN;
+-- 
+2.43.0
+
--- a/FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
+++ b/FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
--- a/README.md
+++ b/README.md
@ -5,3 +5,24 @@ demux, stream, filter and play pretty much anything that humans and machines
 have created. It supports the most obscure ancient formats up to the cutting
 edge. No matter if they were designed by some standards committee, the
 community or a corporation.
+
+## Creating the 'free' tarball
+
+1. Update the `Version` in the spec file.
+2. Set the `Release` to 0 in the spec file.
+3. Set `pkg_suffix` to `%nil`
+4. Do a full build locally: `fedpkg mockbuild --with full_build`
+5. Run `./ffmpeg_update_free_sources.sh results_ffmpeg/5.0/0.fc35/build.log`
+   This will update the `ffmpeg_free_sources` file list.
+   Note that header files will need to be manually added
+   to the `ffmpeg_free_sources` file list.
+6. Run `./ffmpeg_gen_free_tarball.sh` to create the tarball.
+7. Set `pkg_suffix` to `-free` again
+8. Set the `Release` to 1 in the spec file.
+9. Do a scratch build.
+
+OR
+
+1. Edit `ffmpeg_free_sources` and add missing files
+2. Run `./ffmpeg_gen_free_tarball.sh` to create the tarball.
+3. Do a scratch build.
--- a/22
+++ b/22
@ -1,5 +1,4 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
-aac
 aasc
 libfdk_aac # fdk-aac-free
 ac3
@ -57,7 +56,6 @@ adpcm_xa
 adpcm_xmd
 adpcm_yamaha
 adpcm_zork
-aic
 alac
 alias_pix
 amrnb
@ -69,7 +67,6 @@ anull
 apac
 ape
 apng # animated png
-apv
 arbc
 argo
 ass # trivial
@ -84,6 +81,7 @@ aura
 aura2
 av1 # libaom
 av1_qsv # libaom
+ayuv # trivial
 bethsoftvid # trivial
 bfi # trivial
 bink
@ -116,7 +114,6 @@ dfa
 dfpwm
 dirac # dirac
 dnxhd
-dnxhr
 dolby_e
 dpx
 dsd_lsbf
@ -165,7 +162,7 @@ gsm_ms
 gsm_ms_at
 h261
 h263
-h263_v4l2m2m # hardware
+h263_v4l2m2m
 h263i
 h263p
 hap
@ -198,8 +195,6 @@ jv
 kgv1
 kmvc
 lagarith
-libaribb24 # aribb24
-libaribcaption # libaribcaption
 libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
@ -208,10 +203,9 @@ libgsm # libgsm
 libgsm_ms # libgsm
 libilbc # ilbc
 libjxl # libjxl
-liblc3 # liblc3
 libopencore_amrnb # opencore-amr
 libopencore_amrwb # opencore-amr
-libopenh264 # openh264
+libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
 libopus # opus
 librsvg # librsvg
@ -220,7 +214,6 @@ libspeex # speex
 libvorbis # libvorbis
 libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
-libxevd
 libzvbi_teletext # zvbi
 loco
 lscr
@ -251,13 +244,13 @@ mp3on4
 mp3on4float
 mpc7
 mpc8
-mpeg1_v4l2m2m
 mpeg1video
+mpeg1_v4l2m2m
+mpeg2video
 mpeg2_qsv
 mpeg2_v4l2m2m
-mpeg2video
 mpeg4
-mpeg4_v4l2m2m # hardware
+mpeg4_v4l2m2m
 mpegvideo
 mpl2
 msa1
@ -335,8 +328,6 @@ pictor
 pjs
 png # libpng
 ppm # trivial
-prores
-prores_raw
 prosumer
 psd
 ptx
@ -344,7 +335,6 @@ qcelp
 qdm2
 qdmc
 qdraw
-qoa
 qoi
 qpeg
 qtrle
--- a/17
+++ b/17
@ -31,6 +31,7 @@ av1_amf
 av1_nvenc
 av1_qsv
 av1_vaapi
+ayuv # trival
 bitpacked # trivial
 bmp # trivial
 cinepak
@ -38,7 +39,6 @@ cljr
 dca
 dfpwm
 dnxhd
-dnxhr
 dpx
 dvbsub
 dvdsub
@ -70,23 +70,22 @@ hevc_v4l2m2m # hardware
 hevc_vaapi # hardware
 huffyuv # trivial+zlib
 ilbc # ilbc
-jpeg2000
 jpegls
-libaom
+jpeg2000
+libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
 libgsm_ms # libgsm
 libilbc # ilbc
 libjxl # libjxl
-liblc3 # liblc3
 libmp3lame # lame
-liboapv
 libopencore_amrnb
-libopenh264 # openh264
+libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
 libopus # opus
 librav1e # rav1e
+libschroedinger # schroedinger
 libspeex # speex
 libsvtav1
 libtheora # libtheora
@ -97,7 +96,6 @@ libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
 libwebp # libwebp
 libwebp_anim # libwebp
-libxeve
 libxvid # xvidcore
 mjpeg # mjpegtools
 mjpeg_qsv # mjpegtools
@ -106,9 +104,9 @@ mlp
 mp2 # twolame
 mp2fixed # twolame
 mpeg1video
+mpeg2video
 mpeg2_qsv
 mpeg2_vaapi
-mpeg2video
 mpeg4
 mpeg4_v4l2m2m # hardware
 msmpeg4v2
@ -149,9 +147,6 @@ pgmyuv # trivial
 phm # trivial
 png # libpng
 ppm # trivial
-prores
-prores_aw
-prores_ks
 qoi
 qtrle
 r10k # trivial
--- a/ffmpeg-allow-fdk-aac-free.patch
+++ b/ffmpeg-allow-fdk-aac-free.patch
@ -4,24 +4,23 @@ fdk-aac-free-devel is GPL compatible

 See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112

-Index: ffmpeg-7.0/configure
+Index: ffmpeg-5.0/configure
 ===================================================================
--- ffmpeg-7.0.orig/configure	2022-02-09 20:07:49.490888877 +0100
-+++ ffmpeg-7.0/configure	2022-02-09 20:08:30.102854308 +0100
-@@ -1872,7 +1872,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
-
+--- ffmpeg-5.0.orig/configure	2022-02-09 20:07:49.490888877 +0100
+++ ffmpeg-5.0/configure	2022-02-09 20:08:30.102854308 +0100
+@@ -1783,7 +1783,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+ 
 EXTERNAL_LIBRARY_NONFREE_LIST="
     decklink
 -    libfdk_aac
     libtls
 "
-
-@@ -1912,6 +1911,7 @@ EXTERNAL_LIBRARY_LIST="
-     libcodec2
+ 
+@@ -1822,6 +1821,7 @@ EXTERNAL_LIBRARY_LIST="
     libdav1d
     libdc1394
+     libdrm
 +    libfdk_aac
     libflite
     libfontconfig
     libfreetype
-
--- a/ffmpeg-chromium.patch
+++ b/ffmpeg-chromium.patch
@ -12,35 +12,35 @@ diff --git a/libavformat/avformat.h b/libavformat/avformat.h
 index 1916aa2dc5..e6682849fa 100644
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
-
- struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
-
+@@ -1019,6 +1019,10 @@ attribute_deprecated
+ int64_t    av_stream_get_end_pts(const AVStream *st);
+ #endif
+ 
 +// Chromium: We use the internal field first_dts vvv
 +int64_t    av_stream_get_first_dts(const AVStream *st);
 +// Chromium: We use the internal field first_dts ^^^
 +
 #define AV_PROGRAM_RUNNING 1
-
+ 
 /**
 diff --git a/libavformat/utils.c b/libavformat/utils.c
 index cf4d68bff9..7d750abf88 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
-@@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
-  * various utility functions for use within FFmpeg
-  */
+@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+     return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
+ }
 
 +// Chromium: We use the internal field first_dts vvv
 +int64_t av_stream_get_first_dts(const AVStream *st)
 +{
-+    return cffstream(st)->first_dts;
+  return cffstream(st)->first_dts;
 +}
 +// Chromium: We use the internal field first_dts ^^^
 +
 /* an arbitrarily chosen "sane" max packet size -- 50M */
 #define SANE_CHUNK_SIZE (50000000)
-
+ 
 -- 
 2.41.0

--- a/ffmpeg-codec-choice.patch
+++ b/ffmpeg-codec-choice.patch
@ -11,19 +11,19 @@ reduced codec selection list.
 libavformat/matroskaenc.c |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

-Index: ffmpeg-7.0/libavformat/matroskaenc.c
+Index: ffmpeg-6.0/libavformat/matroskaenc.c
 ===================================================================
--- ffmpeg-7.0.orig/libavformat/matroskaenc.c
-+++ ffmpeg-7.0/libavformat/matroskaenc.c
-@@ -3540,16 +3540,25 @@ static int mkv_query_codec(enum AVCodecI
+--- ffmpeg-6.0.orig/libavformat/matroskaenc.c
+++ ffmpeg-6.0/libavformat/matroskaenc.c
+@@ -3321,16 +3321,25 @@ static int mkv_query_codec(enum AVCodecI
     return 0;
 }
-
+ 
 +#define PREFAUDIO \
-+    CONFIG_LIBOPUS_ENCODER ? AV_CODEC_ID_OPUS : \
-+    CONFIG_AAC_ENCODER ? AV_CODEC_ID_AAC : \
-+    CONFIG_VORBIS_ENCODER ? AV_CODEC_ID_VORBIS : \
-+    AV_CODEC_ID_AC3
+	CONFIG_LIBOPUS_ENCODER ? AV_CODEC_ID_OPUS : \
+	CONFIG_AAC_ENCODER ? AV_CODEC_ID_AAC : \
+	CONFIG_VORBIS_ENCODER ? AV_CODEC_ID_VORBIS : \
+	AV_CODEC_ID_AC3
 +
 const FFOutputFormat ff_matroska_muxer = {
     .p.name            = "matroska",
@ -36,16 +36,16 @@ Index: ffmpeg-7.0/libavformat/matroskaenc.c
 -    .p.video_codec     = CONFIG_LIBX264_ENCODER ?
 -                         AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,
 +    .p.audio_codec     = PREFAUDIO,
-+    .p.video_codec     =
-+    CONFIG_LIBVPX_VP9_ENCODER ? AV_CODEC_ID_VP9 : \
-+    CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : \
-+    CONFIG_LIBVPX_VP8_ENCODER ? AV_CODEC_ID_VP8 : \
-+    CONFIG_MPEG4_ENCODER ? AV_CODEC_ID_MPEG4 : \
-+    AV_CODEC_ID_THEORA,
+    .p.video_codec     = 
+	CONFIG_LIBVPX_VP9_ENCODER ? AV_CODEC_ID_VP9 : \
+	CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : \
+	CONFIG_LIBVPX_VP8_ENCODER ? AV_CODEC_ID_VP8 : \
+	CONFIG_MPEG4_ENCODER ? AV_CODEC_ID_MPEG4 : \
+	AV_CODEC_ID_THEORA,
     .init              = mkv_init,
     .deinit            = mkv_deinit,
     .write_header      = mkv_write_header,
-@@ -3617,8 +3626,7 @@ const FFOutputFormat ff_matroska_audio_m
+@@ -3388,8 +3397,7 @@ const FFOutputFormat ff_matroska_audio_m
     .p.mime_type       = "audio/x-matroska",
     .p.extensions      = "mka",
     .priv_data_size    = sizeof(MatroskaMuxContext),
@ -55,4 +55,3 @@ Index: ffmpeg-7.0/libavformat/matroskaenc.c
     .p.video_codec     = AV_CODEC_ID_NONE,
     .init              = mkv_init,
     .deinit            = mkv_deinit,
-
--- a/ffmpeg-dlopen-openh264.patch
+++ b/ffmpeg-dlopen-openh264.patch
@ -0,0 +1,363 @@
+From 1f48740db0dda8d6ec1b97a7f4a794e381a65636 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
+
+We can't directly depend on OpenH264, but we can weakly link to it
+and gracefully expose the capability.
+
+Co-authored-by: Andreas Schneider <asn@cryptomilk.org>
+Co-authored-by: Neal Gompa <ngompa@fedoraproject.org>
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
+---
+ configure                       |   3 +
+ libavcodec/Makefile             |   1 +
+ libavcodec/libopenh264.c        |   5 ++
+ libavcodec/libopenh264_dlopen.c | 147 ++++++++++++++++++++++++++++++++
+ libavcodec/libopenh264_dlopen.h |  58 +++++++++++++
+ libavcodec/libopenh264dec.c     |  10 +++
+ libavcodec/libopenh264enc.c     |  10 +++
+ 7 files changed, 234 insertions(+)
+ create mode 100644 libavcodec/libopenh264_dlopen.c
+ create mode 100644 libavcodec/libopenh264_dlopen.h
+
+diff --git a/configure b/configure
+index ba5793b2ff..8855c1a908 100755
+--- a/configure
+++ b/configure
+@@ -251,6 +251,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]
+  --enable-libopenh264-dlopen  enable H.264 encoding via dlopen()'ed OpenH264 [no]
+   --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="
+     libmysofa
+     libopencv
+     libopenh264
+    libopenh264_dlopen
+     libopenjpeg
+     libopenmpt
+     libopenvino
+@@ -6596,6 +6598,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
+enabled libopenh264_dlopen && enable libopenh264 && add_cppflags "-I$(dirname `readlink -f $0`)/ffdlopenhdrs/include -DCONFIG_LIBOPENH264_DLOPEN=1"
+ enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
+                                { 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
+--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
+@@ -1075,6 +1075,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
+diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
+index c80c85ea8b..128c3d9846 100644
+--- a/libavcodec/libopenh264.c
+++ b/libavcodec/libopenh264.c
+@@ -20,8 +20,13 @@
+  */
+ 
+ #include <string.h>
+
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+#include "libopenh264_dlopen.h"
+#else
+ #include <wels/codec_api.h>
+ #include <wels/codec_ver.h>
+#endif
+ 
+ #include "libavutil/error.h"
+ #include "libavutil/log.h"
+diff --git a/libavcodec/libopenh264_dlopen.c b/libavcodec/libopenh264_dlopen.c
+new file mode 100644
+index 0000000000..49ea8ff44f
+--- /dev/null
+++ b/libavcodec/libopenh264_dlopen.c
+@@ -0,0 +1,147 @@
+/*
+ * OpenH264 dlopen code
+ *
+ * Copyright (C) 2022 Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <dlfcn.h>
+
+#include "libopenh264_dlopen.h"
+
+/*
+ * The symbol binding makes sure we do not run into strict aliasing issues which
+ * can lead into segfaults.
+ */
+typedef int (*__oh264_WelsCreateSVCEncoder)(ISVCEncoder **);
+typedef void (*__oh264_WelsDestroySVCEncoder)(ISVCEncoder *);
+typedef int (*__oh264_WelsGetDecoderCapability)(SDecoderCapability *);
+typedef long (*__oh264_WelsCreateDecoder)(ISVCDecoder **);
+typedef void (*__oh264_WelsDestroyDecoder)(ISVCDecoder *);
+typedef OpenH264Version (*__oh264_WelsGetCodecVersion)(void);
+typedef void (*__oh264_WelsGetCodecVersionEx)(OpenH264Version *);
+
+#define OH264_SYMBOL_ENTRY(i)                                                  \
+  union {                                                                      \
+    __oh264_##i f;                                                             \
+    void *obj;                                                                 \
+  } _oh264_##i
+
+struct oh264_symbols {
+  OH264_SYMBOL_ENTRY(WelsCreateSVCEncoder);
+  OH264_SYMBOL_ENTRY(WelsDestroySVCEncoder);
+  OH264_SYMBOL_ENTRY(WelsGetDecoderCapability);
+  OH264_SYMBOL_ENTRY(WelsCreateDecoder);
+  OH264_SYMBOL_ENTRY(WelsDestroyDecoder);
+  OH264_SYMBOL_ENTRY(WelsGetCodecVersion);
+  OH264_SYMBOL_ENTRY(WelsGetCodecVersionEx);
+};
+
+/* Symbols are bound by loadLibOpenH264() */
+static struct oh264_symbols openh264_symbols;
+
+int oh264_WelsCreateSVCEncoder(ISVCEncoder **ppEncoder) {
+  return openh264_symbols._oh264_WelsCreateSVCEncoder.f(ppEncoder);
+}
+
+void oh264_WelsDestroySVCEncoder(ISVCEncoder *pEncoder) {
+  return openh264_symbols._oh264_WelsDestroySVCEncoder.f(pEncoder);
+}
+
+int oh264_WelsGetDecoderCapability(SDecoderCapability *pDecCapability) {
+  return openh264_symbols._oh264_WelsGetDecoderCapability.f(pDecCapability);
+}
+
+long oh264_WelsCreateDecoder(ISVCDecoder **ppDecoder) {
+  return openh264_symbols._oh264_WelsCreateDecoder.f(ppDecoder);
+}
+
+void oh264_WelsDestroyDecoder(ISVCDecoder *pDecoder) {
+  return openh264_symbols._oh264_WelsDestroyDecoder.f(pDecoder);
+}
+
+OpenH264Version oh264_WelsGetCodecVersion(void) {
+  return openh264_symbols._oh264_WelsGetCodecVersion.f();
+}
+
+void oh264_WelsGetCodecVersionEx(OpenH264Version *pVersion) {
+  openh264_symbols._oh264_WelsGetCodecVersionEx.f(pVersion);
+}
+
+static void *_oh264_bind_symbol(AVCodecContext *avctx,
+                                void *handle,
+                                const char *sym_name) {
+    void *sym = NULL;
+
+    sym = dlsym(handle, sym_name);
+    if (sym == NULL) {
+        const char *err = dlerror();
+        av_log(avctx,
+               AV_LOG_WARNING,
+               "%s: Failed to bind %s\n",
+               err,
+               sym_name);
+        return NULL;
+    }
+
+    return sym;
+}
+
+#define oh264_bind_symbol(avctx, handle, sym_name)                           \
+  if (openh264_symbols._oh264_##sym_name.obj == NULL) {                      \
+    openh264_symbols._oh264_##sym_name.obj = _oh264_bind_symbol(avctx, handle, #sym_name); \
+    if (openh264_symbols._oh264_##sym_name.obj == NULL) {                    \
+      return 1;                                                              \
+    }                                                                        \
+  }
+
+int loadLibOpenH264(AVCodecContext *avctx) {
+  static bool initialized = false;
+  void *libopenh264 = NULL;
+  const char *err = NULL;
+
+  if (initialized) {
+      return 0;
+  }
+
+#define OPENH264_LIB "libopenh264.so.7"
+  libopenh264 = dlopen(OPENH264_LIB, RTLD_LAZY);
+  err = dlerror();
+  if (err != NULL) {
+    av_log(avctx, AV_LOG_WARNING,
+           "%s: %s is missing, openh264 support will be disabled\n", err,
+           OPENH264_LIB);
+
+    if (libopenh264 != NULL) {
+      dlclose(libopenh264);
+    }
+    return 1;
+  }
+
+  oh264_bind_symbol(avctx, libopenh264, WelsCreateSVCEncoder);
+  oh264_bind_symbol(avctx, libopenh264, WelsDestroySVCEncoder);
+  oh264_bind_symbol(avctx, libopenh264, WelsGetDecoderCapability);
+  oh264_bind_symbol(avctx, libopenh264, WelsCreateDecoder);
+  oh264_bind_symbol(avctx, libopenh264, WelsDestroyDecoder);
+  oh264_bind_symbol(avctx, libopenh264, WelsGetCodecVersion);
+  oh264_bind_symbol(avctx, libopenh264, WelsGetCodecVersionEx);
+
+  initialized = true;
+
+  return 0;
+}
+diff --git a/libavcodec/libopenh264_dlopen.h b/libavcodec/libopenh264_dlopen.h
+new file mode 100644
+index 0000000000..d7d8bb7cad
+--- /dev/null
+++ b/libavcodec/libopenh264_dlopen.h
+@@ -0,0 +1,58 @@
+/*
+ * OpenH264 dlopen code
+ *
+ * Copyright (C) 2022 Andreas Schneider <asn@cryptomilk.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef HAVE_LIBOPENH264_DLOPEN_H
+#define HAVE_LIBOPENH264_DLOPEN_H
+
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+
+#include <wels/codec_api.h>
+#include <wels/codec_ver.h>
+
+#include "avcodec.h"
+
+int oh264_WelsCreateSVCEncoder(ISVCEncoder **ppEncoder);
+#define WelsCreateSVCEncoder oh264_WelsCreateSVCEncoder
+
+void oh264_WelsDestroySVCEncoder(ISVCEncoder *pEncoder);
+#define WelsDestroySVCEncoder oh264_WelsDestroySVCEncoder
+
+int oh264_WelsGetDecoderCapability(SDecoderCapability *pDecCapability);
+#define WelsGetDecoderCapability oh264_WelsGetDecoderCapability
+
+long oh264_WelsCreateDecoder(ISVCDecoder **ppDecoder);
+#define WelsCreateDecoder oh264_WelsCreateDecoder
+
+void oh264_WelsDestroyDecoder(ISVCDecoder *pDecoder);
+#define WelsDestroyDecoder oh264_WelsDestroyDecoder
+
+OpenH264Version oh264_WelsGetCodecVersion(void);
+#define WelsGetCodecVersion oh264_WelsGetCodecVersion
+
+void oh264_WelsGetCodecVersionEx(OpenH264Version *pVersion);
+#define WelsGetCodecVersionEx oh264_WelsGetCodecVersionEx
+
+int loadLibOpenH264(AVCodecContext *avctx);
+
+#endif /* CONFIG_LIBOPENH264_DLOPEN */
+
+#endif /* HAVE_LIBOPENH264_DLOPEN_H */
+diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
+index 7e14d4dd7d..a805598446 100644
+--- a/libavcodec/libopenh264dec.c
+++ b/libavcodec/libopenh264dec.c
+@@ -19,8 +19,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+#include "libopenh264_dlopen.h"
+#else
+ #include <wels/codec_api.h>
+ #include <wels/codec_ver.h>
+#endif
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/fifo.h"
+@@ -55,6 +59,12 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
+     int log_level;
+     WelsTraceCallback callback_function;
+ 
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+    if (loadLibOpenH264(avctx)) {
+         return AVERROR_DECODER_NOT_FOUND;
+    }
+#endif
+
+     if (WelsCreateDecoder(&s->decoder)) {
+         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
+--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
+@@ -19,8 +19,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+#include "libopenh264_dlopen.h"
+#else
+ #include <wels/codec_api.h>
+ #include <wels/codec_ver.h>
+#endif
+ 
+ #include "libavutil/attributes.h"
+ #include "libavutil/common.h"
+@@ -114,6 +118,12 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
+     WelsTraceCallback callback_function;
+     AVCPBProperties *props;
+ 
+#ifdef CONFIG_LIBOPENH264_DLOPEN
+    if (loadLibOpenH264(avctx)) {
+         return AVERROR_ENCODER_NOT_FOUND;
+    }
+#endif
+
+     if (WelsCreateSVCEncoder(&s->encoder)) {
+         av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
+         return AVERROR_UNKNOWN;
+-- 
+2.36.1
+
--- 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
@ -0,0 +1,37 @@
+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-support-evc-base-libraries.patch
+++ b/ffmpeg-support-evc-base-libraries.patch
@ -1,73 +0,0 @@
-From 80bf83e3099652a3e7f8d1e8b6d902fea1ce4db9 Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Sun, 24 Aug 2025 15:57:16 -0300
-Subject: [PATCH] configure: support linking to base profile libxev{d,e}
-
-Addresses issue #20328.
-
-Signed-off-by: James Almer <jamrial@gmail.com>
---
- configure | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index aa41b2a7b3..5386ae8b9a 100755
--- a/configure
-+++ b/configure
-@@ -299,7 +299,9 @@ External library support:
-   --enable-libx264         enable H.264 encoding via x264 [no]
-   --enable-libx265         enable HEVC encoding via x265 [no]
-   --enable-libxeve         enable EVC encoding via libxeve [no]
-+  --enable-libxeveb        enable EVC encoding via libxeve (Base profile) [no]
-   --enable-libxevd         enable EVC decoding via libxevd [no]
-+  --enable-libxevdb        enable EVC decoding via libxevd (Base profile) [no]
-   --enable-libxavs         enable AVS encoding via xavs [no]
-   --enable-libxavs2        enable AVS2 encoding via xavs2 [no]
-   --enable-libxcb          enable X11 grabbing using XCB [autodetect]
-@@ -1992,7 +1994,9 @@ EXTERNAL_LIBRARY_LIST="
-     libvvenc
-     libwebp
-     libxevd
-+    libxevdb
-     libxeve
-+    libxeveb
-     libxml2
-     libzimg
-     libzmq
-@@ -3669,8 +3673,8 @@ libx265_encoder_deps="libx265"
- libx265_encoder_select="atsc_a53 dovi_rpuenc"
- libxavs_encoder_deps="libxavs"
- libxavs2_encoder_deps="libxavs2"
-libxevd_decoder_deps="libxevd"
-libxeve_encoder_deps="libxeve"
-+libxevd_decoder_deps_any="libxevd libxevdb"
-+libxeve_encoder_deps_any="libxeve libxeveb"
- libxvid_encoder_deps="libxvid"
- libzvbi_teletext_decoder_deps="libzvbi"
- vapoursynth_demuxer_deps="vapoursynth"
-@@ -4615,6 +4619,12 @@ enabled_all gnutls mbedtls &&
- enabled_all openssl mbedtls &&
-     die "OpenSSL and mbedTLS must not be enabled at the same time."
- 
-+enabled_all libxevd libxevdb &&
-+    die "libxevd and libxevdb must not be enabled at the same time."
-+
-+enabled_all libxeve libxeveb &&
-+    die "libxeve and libxevdb must not be enabled at the same time."
-+
- # Disable all the library-specific components if the library itself
- # is disabled, see AVCODEC_LIST and following _LIST variables.
- 
-@@ -7204,7 +7214,9 @@ enabled libx265           && require_pkg_config libx265 x265 x265.h x265_api_get
- enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
- enabled libxavs2          && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
- enabled libxevd           && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode
-+enabled libxevdb          && require_pkg_config libxevdb "xevdb >= 0.4.1" "xevd.h" xevd_decode
- enabled libxeve           && require_pkg_config libxeve "xeve >= 0.5.1" "xeve.h" xeve_encode
-+enabled libxeveb          && require_pkg_config libxeveb "xeveb >= 0.5.1" "xeve.h" xeve_encode
- enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
- enabled libzimg           && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version
- enabled libzmq            && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new
-- 
-2.49.1
-
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
--- a/4051
+++ b/4051
--- a/ffmpeg_gen_free_tarball.sh
+++ b/ffmpeg_gen_free_tarball.sh
@ -0,0 +1,130 @@
+#!/bin/bash
+#
+# Copyright (c) 2022      Andreas Schneider <asn@cryptomilk.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# shellcheck disable=2181
+
+export LC_COLLATE="C.UTF-8"
+
+FF_PKGNAME="ffmpeg"
+FF_PKGNAME_SUFFIX="-free"
+FF_VERSION="$(rpmspec -P ./*.spec | grep ^Version | sed -e 's/Version:[ ]*//g')"
+FF_TARBALL_URL="https://ffmpeg.org/releases/${FF_PKGNAME}-${FF_VERSION}.tar.xz"
+FF_TARBALL="$(basename "${FF_TARBALL_URL}")"
+FF_GPG_ARMOR_FILE="${FF_TARBALL}.asc"
+FF_PKG_DIR="$(pwd)"
+FF_KEYRING="${FF_PKG_DIR}/ffmpeg.keyring"
+FF_TMPDIR=$(mktemp --tmpdir -d ffmpeg-XXXXXXXX)
+FF_PATH="${FF_TMPDIR}/${FF_PKGNAME}-${FF_VERSION}"
+
+cleanup_tmpdir() {
+    # shellcheck disable=2164
+    popd 2>/dev/null
+    rm -rf "${FF_TMPDIR}"
+}
+trap cleanup_tmpdir SIGINT
+
+cleanup_and_exit()
+{
+    cleanup_tmpdir
+
+    if test "$1" = 0 -o -z "$1"; then
+        exit 0
+    else
+        # shellcheck disable=2086
+        exit ${1}
+    fi
+}
+
+if [[ ! -w "${FF_TARBALL}" ]]; then
+    echo ">>> Downloading tarball"
+    wget "${FF_TARBALL_URL}"
+fi
+if [[ ! -w "${FF_TARBALL}.asc" ]]; then
+    echo ">>> Downloading signature"
+    wget "${FF_TARBALL_URL}.asc"
+fi
+
+echo ">>> Verifying ${FF_TARBALL} GPG signature"
+gpgv2 --quiet --keyring "${FF_KEYRING}" "${FF_GPG_ARMOR_FILE}" "${FF_TARBALL}"
+if [ $? -ne 0 ]; then
+    echo "ERROR: GPG signature verification failed"
+    cleanup_and_exit 1
+fi
+echo
+
+echo ">>> Unpacking ${FF_TARBALL}"
+
+tar -xf "${FF_TARBALL}" -C "${FF_TMPDIR}"
+if [ $? -ne 0 ]; then
+    echo "ERROR: Failed to unpack ${FF_TARBALL}"
+    cleanup_and_exit 1
+fi
+
+if [[ ! -r ffmpeg_free_sources ]]; then
+    echo "ERROR: ffmpeg_free_sources doesn't exist!"
+    cleanup_and_exit 1
+fi
+readarray -t keepfiles < ffmpeg_free_sources
+
+pushd "${FF_PATH}" || cleanup_and_exit 1
+
+echo
+echo ">>> Cleaning up sources for new tarball ..."
+
+# Get file list from ffmpeg
+mapfile -d '' filelist < <(find ./ -type f -printf '%P\0')
+
+# Sort arrays
+readarray -t keepfiles_sorted < <(printf '%s\0' "${keepfiles[@]}" | sort -z | xargs -0n1)
+readarray -t filelist_sorted < <(printf '%s\0' "${filelist[@]}" | sort -z | xargs -0n1)
+
+# Compare arrays and remove files which are left over
+comm -2 -3 -z <(printf '%s\0' "${filelist_sorted[@]}") <(printf '%s\0' "${keepfiles_sorted[@]}") | xargs -0 rm -f
+
+readarray -t removed_files < <(comm -1 -3 -z <(printf '%s\0' "${filelist_sorted[@]}") <(printf '%s\0' "${keepfiles_sorted[@]}") | xargs -0n1)
+if [[ "${#removed_files[@]}" -ge 1 ]]; then
+    if [[ "${#removed_files[@]}" -eq 1 ]] && [[ -z "${removed_files[0]}" ]]; then
+        echo "... done"
+    else
+        echo "File not in upstream tarball anymore (please cleanup 'ffmpeg_free_sources'):"
+        for f in "${removed_files[@]}"; do
+            if [[ -z "${f}" ]]; then
+                continue
+            fi
+            echo "  * ${f}"
+        done
+    fi
+fi
+echo
+
+popd || cleanup_and_exit 1 # /FF_PATH
+
+pushd "${FF_TMPDIR}" || cleanup_and_exit 1
+
+echo ">>> Create new tarball ${FF_PKGNAME}${FF_PKGNAME_SUFFIX}-${FF_VERSION}.tar.xz ..."
+tar -cJf "${FF_PKG_DIR}/${FF_PKGNAME}${FF_PKGNAME_SUFFIX}-${FF_VERSION}.tar.xz" "${FF_PKGNAME}-${FF_VERSION}"
+if [ $? -ne 0 ]; then
+    echo "ERROR: Creating tarball failed"
+    cleanup_and_exit 1
+fi
+
+popd || cleanup_and_exit 1 # /FF_TMPDIR
+
+du -sh "${FF_PKGNAME}${FF_PKGNAME_SUFFIX}-${FF_VERSION}.tar.xz"
+echo
+
+cleanup_and_exit 0
--- a/ffmpeg_update_free_sources.sh
+++ b/ffmpeg_update_free_sources.sh
@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Copyright (c) 2022      Andreas Schneider <asn@cryptomilk.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# shellcheck disable=2181
+
+export LC_COLLATE="C.UTF-8"
+
+cleanup_and_exit()
+{
+    if test "$1" = 0 -o -z "$1"; then
+        exit 0
+    else
+        # shellcheck disable=2086
+        exit ${1}
+    fi
+}
+
+echo ">>> Collect information from ${1}"
+build_log="$(readlink -f "${1}")"
+if [[ -z "${build_log}" ]] || [[ ! -r "${build_log}" ]]; then
+    echo "Build log doesn't exist: %{build_log}"
+    cleanup_and_exit 1
+fi
+
+asm_files="$(grep "^gcc.*\.c$" "${build_log}" | awk 'NF>1{print $NF}' | sort)"
+c_files="$(grep "^nasm.*\.asm$" "${build_log}" | awk 'NF>1{print $NF}' | sort)"
+
+# shellcheck disable=2206
+new_sources=(${asm_files}
+             ${c_files})
+
+# Sort arrays
+readarray -t new_sources_sorted < <(printf '%s\0' "${new_sources[@]}" | sort -z | xargs -0n1)
+
+# Create a backup for a diff
+cp -a ffmpeg_free_sources ffmpeg_free_sources.orig
+cp -a ffmpeg_free_sources ffmpeg_free_sources.new
+printf "%s\n" "${new_sources_sorted[@]}" >> ffmpeg_free_sources.new
+# Update ffmpeg_free_sources
+echo ">>> Updating ffmpeg_free_sources"
+sort < ffmpeg_free_sources.new | uniq | sed '/^$/d' > ffmpeg_free_sources
+echo ">>> Differences in file list"
+diff -u ffmpeg_free_sources.orig ffmpeg_free_sources
+rm -f ffmpeg_free_sources.new
+
+cleanup_and_exit 0
--- a/5
+++ b/5
@ -1,3 +1,4 @@
-SHA512 (ffmpeg-8.0.1.tar.xz) = 7af5cd1c7ba04f8d7ea1b54b64b9c235f2a606dc0c18d25cfdf20958bcad4851d3265b4894fc6ba5dd205c2309971c7e7fb890ee1d64e0a41a3faf159f77957f
-SHA512 (ffmpeg-8.0.1.tar.xz.asc) = f56e9e89ecdf9f12e3dae90b52289e5d09bfbfc0f6e13aaf17da9330c138fdb62b132f856c2fd16f5d9f5d6bcf1725602c8781c3e5f07bda6ce1306c379792ab
+SHA512 (ffmpeg-free-6.0.1.tar.xz) = da4aa6db92fbbfdda9fc64249a0c826ae5de33cacbed5ebbfbbe9a30d57ae6f79b61496fcf151dc504d646efd44ba63722220be0b718dd8ffdaa5b2510d92a97
+SHA512 (ffmpeg-6.0.1.tar.xz.asc) = 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c
+SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165
Author	SHA1	Message	Date
Kalev Lember	187b050f07	Backport upstream patch to drop openh264 runtime version checks ... in order to make it possible for us to update openh264 without having to recompile ffmpeg against the new version every time. As openh264 is distributed by Cisco and ffmpeg is in Fedora, it's difficult to coordinate lock step updates. Drop the version check to make this easier. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=10211 This also rebases downstream ffmpeg-dlopen-openh264.patch on top of the new patch.	2023-12-08 13:09:10 -05:00
Kalev Lember	73f1d91714	Prefer openh264 over noopenh264 Add "Suggests: openh264" so that dnf picks openh264 over noopenh264 that both provide the same library.	2023-12-08 13:09:10 -05:00
Neal Gompa	7207d79858	Fix ffmpeg-allow-fdk-aac-free.patch to apply with git-am	2023-11-11 09:53:13 -05:00
Neal Gompa	84a6385f06	Update to 6.0.1 - Add ffmpeg chromium support patch (#2240127) - Use git to apply patches	2023-11-11 09:46:31 -05:00
Neal Gompa	3739445cff	Add patches to support enhanced RTMP and AV1 encoding through VA-API - Force AAC decoding through fdk-aac-free	2023-11-10 08:18:38 -05:00
Dominik Mierzejewski	88ff89db5b	Backport upstream patch to fix segfault when passing non-existent filter option (rfbz#6773)	2023-10-09 10:04:19 +02:00