Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

ffmpeg-4.changes Changed

@@ -1,427 +1,4 @@
 -------------------------------------------------------------------
-Fri Jun 26 08:19:18 UTC 2026 - Jan Engelhardt <jengelh@inai.de>
-
-- Add pcmbluray-bigendian.patch to address a build failure on s390x
-- Update to release 4.4.8
-  * Various bug fixes to codecs
-  * avcodec/magicyuv: Fix 1 line MEDIAN slices
-    avcodec/magicyuv: Expand the s->interlaced slice-height sanity check
-    avcodec/magicyuv: reject slice_height misaligned with chroma vshift
-    (CVE-2026-8461, bsc#1269490)
-- Delete ffmpeg-4-CVE-2025-22921.patch (merged)
-
--------------------------------------------------------------------
-Sat May 23 17:15:08 UTC 2026 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2025-10256.patch:
-  Backport a2546248 from upstream, Add check for the return value
-  of av_malloc_array() to avoid potential NULL pointer dereference.
-  (CVE-2025-10256, bsc#1249431)
-
--------------------------------------------------------------------
-Fri May 22 17:28:33 UTC 2026 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 4.4.7:
-  * Codecs, filters and other various bugfixes
-  * aacenc_tns: clamp filter direction energy measurement.
-    (CVE-2025-1594, bsc#1237561)
-  * avcodec/jpeg2000dec: implement cdef remapping during pixel format matching.
-    (CVE-2025-9951, bsc#1249393)
-  * avcodec/av1dec: check that primary_ref_frame is within range.
-    (CVE-2026-30997, bsc#1262047)
-  * avcodec/rasc: fix heap use-after-free in decode_move().
-    (CVE-2026-12706, bsc#1268595)
-- Drop patches fixed upstream:
-  * ffmpeg-4-CVE-2024-35368.patch
-  * ffmpeg-4-CVE-2024-36618.patch
-  * ffmpeg-4-CVE-2025-59728.patch
-- Rebase patches with quilt.
-
--------------------------------------------------------------------
-Wed May 13 07:37:57 UTC 2026 - Alynx Zhou <alynx.zhou@suse.com>
-
-- Add ffmpeg-4-CVE-2026-40962.patch: Use 64bit in CENC subsample
-  bounds checks. (CVE-2026-40962, bsc#1262237)
-
--------------------------------------------------------------------
-Thu Jan 15 07:36:04 UTC 2026 - SongChuan Kang <sckang@suse.com>
-
-- Add ffmpeg-4-CVE-2025-63757.patch: Backport 0c6b7f948 from
-  upstream. swscale/output: Fix integer overflow in
-  yuv2ya16_X_c_template() (bsc#1255392, CVE-2025-63757).
-
--------------------------------------------------------------------
-Sun Jan 08 10:04:01 UTC 2026 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2023-6601-shim01-6b1f68cc.patch:
-  Backport 6b1f68cc from upstream, fail on probing non hls/m3u8 file
-  extensions. Its unexpected that a .avi or other "standard" file turns
-  into a playlist. The goal of this patch is to avoid this unexpected
-  behavior and possible privacy or security differences.
-  (CVE-2023-6601, bsc#1220545)
-- Add ffmpeg-4-CVE-2023-6601-shim02-954d16fa.patch:
-  Backport 954d16fa from upstream, Try to implement RFC8216 playlist
-  refusal.
-  (CVE-2023-6601, bsc#1220545)
-- Add ffmpeg-4-CVE-2023-6601-shim03-a0cb5722.patch:
-  Backport a0cb5722 from upstream, Check mime_ok first, This should
-  be a few nano seconds faster (not measureable), But Collectively
-  the whole humankind watching hls will safe a minute.
-  (CVE-2023-6601, bsc#1220545)
-- Add ffmpeg-4-CVE-2023-6601-shim04-5b630743.patch:
-  Backport 5b630743 from upstream, Better message from hls_probe()
-  (CVE-2023-6601, bsc#1220545)
-- Add ffmpeg-4-CVE-2023-6601.patch:
-  Backport d09f50c0f from upstream, remove non standard hls
-  extension.
-  (CVE-2023-6601, bsc#1220545)
-
--------------------------------------------------------------------
-Wed Oct 15 02:12:04 UTC 2025 - SongChuan Kang <sckang@suse.com>
-
-- Add ffmpeg-4-CVE-2025-59728.patch: avformat/dashdec: Allocate
-  space for appended "/" (bsc#1251137, CVE-2025-59728).
-
--------------------------------------------------------------------
-Tue Oct  7 12:34:56 UTC 2025 - olaf@aepfle.de
-
-- add missing closing brace to ffmpeg-4-CVE-2025-7700.patch 
-
--------------------------------------------------------------------
-Mon Sep 29 07:25:31 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Add glslang16.patch to resolve FTBFS
-
--------------------------------------------------------------------
-Wed Jul 23 07:01:22 UTC 2025 - SongChuan Kang <sckang@suse.com>
-
-- Add ffmpeg-4-CVE-2025-7700.patch: Add check for the return value
-  of av_malloc_array() and av_calloc() to avoid potential NULL
-  pointer dereference(CVE-2025-7700, bsc#1246790).
-
--------------------------------------------------------------------
-Fri May 30 14:28:05 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2024-36618.patch:
-  Backport 7a089ed8 from upstream, avformat/avidec: Fix integer
-  overflow iff ULONG_MAX < INT64_MAX.
-  (CVE-2024-36618, bsc#1234020)
-
--------------------------------------------------------------------
-Thu May 29 20:43:43 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 4.4.6
-  * lavc/libx265: unbreak build for X265_BUILD >= 210
-  * ARM: vp9mc: Load only 12 pixels in the 4 pixel wide
-    horizontal filter
-  * rtmpproto: Avoid rare crashes in the `fail:` codepath in
-    rtmp_open
-  * avcodec/snow: Fix off by 1 error in run_buffer
-  * avcodec/mpegvideo_enc: Check FLV1 resolution limits
-- Delete ffmpeg-CVE-2023-49502.patch,
-  0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch,
-  ffmpeg-4-CVE-2025-0518.patch, ffmpeg-4-CVE-2025-22919.patch (merged)
-
--------------------------------------------------------------------
-Wed Mar  5 09:46:09 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Add 0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
-  to build with SVT-AV1 3.0.0.
-
--------------------------------------------------------------------
-Fri Feb 19 05:17:22 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2025-22921.patch:
-  Backport 7f9c7f98 from upstream, clear array length when
-  freeing it.
-  (CVE-2025-22921, bsc#1237382)
-
--------------------------------------------------------------------
-Fri Feb 19 04:27:06 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2025-25473.patch:
-  Backport c08d3004 from upstream, clear FFFormatContext packet.
-  When packet_buffer is used in mux.c, and if a muxing process fails
-  at a point where packets remained in said queue.
-  (CVE-2025-25473, bsc#1237351)
-
--------------------------------------------------------------------
-Fri Feb 19 03:18:02 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2025-0518.patch:
-  Backport b5b6391d from upstream, fixes memory data leak when
-  use sscanf().
-  (CVE-2025-0518, bsc#1236007)
-
--------------------------------------------------------------------
-Fri Feb 19 02:58:01 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2025-22919.patch:
-  Backport 1446e37d from upstream, check for valid sample rate
-  As the sample rate <= 0 is invalid.
-  (CVE-2025-22919, bsc#1237371)
-
--------------------------------------------------------------------
-Fri Feb 19 01:48:22 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2024-12361.patch:
-  Backport 4065ff69 from upstream, add check for av_packet_new_side_data()
-  to avoid null pointer dereference if allocation fails.
-  (CVE-2024-12361, bsc#1237358)
-
--------------------------------------------------------------------
-Fri Feb 19 01:11:17 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-
-- Add ffmpeg-4-CVE-2024-35368.patch:
-  Backport 45133009 from upstream, After having created the
-  AVBuffer that is put into frame->buf0, ownership of several
-  objects Fix double-free on the AVFrame is unreferenced.
-  (CVE-2024-35368, bsc#1234028)
-
--------------------------------------------------------------------
-Mon Jan  6 11:53:32 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
-
-- Update to release 4.4.5
-  * Reliability/bug fixes
-  Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
-  Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int'
-  (CVE-2024-36613, bsc#1235092)
-  avformat/cafdec: dont seek beyond 64bit (CVE-2024-36617, bsc#1234019).
-  avformat/westwood_vqa: Fix 2g packets (CVE-2024-36616, bsc#1234018).
-  avformat/sbgdec: Check for negative duration (CVE-2024-35366, bsc#1234030).
-- Delete
-  0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
-  0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
-  0001-avfilter-vf_minterpolate-Check-pts-before-division.patch
-  ffmpeg-CVE-2023-51793.patch
-  0001-avfilter-af_stereowiden-Check-length.patch
-  ffmpeg-fix-new-binutils.patch
-  ffmpeg-CVE-2023-50010.patch

ffmpeg-4.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package ffmpeg-4
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -57,7 +57,7 @@
 %bcond_with    x265
 %bcond_with    xvid
 
-%if 0%{?suse_version} > 1600
+%if 0%{?suse_version} > 1500
 %bcond_without libaom
 %bcond_without mysofa
 %bcond_without vidstab
@@ -69,18 +69,6 @@
 %bcond_without soxr
 %bcond_without zmq
 %bcond_without vulkan
-%bcond_without amrwb
-%bcond_without opencore
-%bcond_without xvid
-%else
-%if 0%{?suse_version} > 1500
-%bcond_without mysofa
-%bcond_without vidstab
-%bcond_without codec2
-%bcond_without rubberband
-%bcond_without vulkan
-%bcond_without amrwb
-%bcond_without opencore
 %else
 %bcond_with libaom
 %bcond_with mysofa
@@ -94,7 +82,6 @@
 %bcond_with zmq
 %bcond_with vulkan
 %endif
-%endif
 
 %if 0%{?suse_version} >= 1500
 %bcond_without zimg
@@ -108,7 +95,7 @@
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.4.8
+Version:        4.4.3
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later
@@ -129,27 +116,13 @@
 Patch3:         ffmpeg-codec-choice.diff
 Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         soversion.patch
+Patch8:         vmaf-trim-usr-local.patch
 Patch9:         ffmpeg-4.4-CVE-2020-22046.patch
 Patch10:        ffmpeg-chromium.patch
 Patch11:        ffmpeg-libglslang-detection.patch
-Patch14:        ffmpeg-glslang-cxx17.patch
-Patch15:        0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
-Patch16:        0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
-Patch22:        ffmpeg-c99.patch
-Patch25:        ffmpeg-4-CVE-2024-12361.patch
-Patch28:        ffmpeg-4-CVE-2025-25473.patch
-Patch30:        ffmpeg-avcodec-libdav1d-don-t-repeatedly-parse-the-same-seq.patch
-Patch32:        ffmpeg-4-CVE-2025-7700.patch
-Patch33:        glslang16.patch
-Patch35:        ffmpeg-4-CVE-2023-6601-shim01-6b1f68cc.patch
-Patch36:        ffmpeg-4-CVE-2023-6601-shim02-954d16fa.patch
-Patch37:        ffmpeg-4-CVE-2023-6601-shim03-a0cb5722.patch
-Patch38:        ffmpeg-4-CVE-2023-6601-shim04-5b630743.patch
-Patch39:        ffmpeg-4-CVE-2023-6601.patch
-Patch40:        ffmpeg-4-CVE-2025-63757.patch
-Patch41:        ffmpeg-4-CVE-2026-40962.patch
-Patch42:        ffmpeg-4-CVE-2025-10256.patch
-Patch43:        pcmbluray-bigendian.patch
+Patch12:        ffmpeg-CVE-2022-3964.patch
+Patch13:        ffmpeg-CVE-2022-3109.patch
+Patch14:        ffmpeg-CVE-2022-3341.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
@@ -201,6 +174,7 @@
 BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libva-drm)
 BuildRequires:  pkgconfig(libva-x11)
+BuildRequires:  pkgconfig(libvmaf) >= 1.3.9
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(libxml-2.0)
 %if %{with zmq}
@@ -250,6 +224,11 @@
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%ifarch x86_64
+BuildRequires:  pkgconfig(libmfx)
+%endif
+%endif
 %if %{with zimg}
 BuildRequires:  pkgconfig(zimg)
 %endif
@@ -280,9 +259,10 @@
 BuildRequires:  pkgconfig(x265)
 %endif
 Provides:       ffmpeg-tools = %version
-Conflicts:      ffmpeg-tools
+Obsoletes:      ffmpeg-tools < %version
 Provides:       ffmpeg = %version
 Obsoletes:      ffmpeg < %version
+Conflicts:      ffmpeg-5
 Requires:       libavcodec58_134 = %version-%release
 Requires:       libavdevice58_13 = %version-%release
 Requires:       libavfilter7_110 = %version-%release
@@ -625,7 +605,7 @@
 %if "%_lto_cflags" != ""
 %global _lto_cflags %_lto_cflags -ffat-lto-objects
 %endif
-CFLAGS="%optflags" CXXFLAGS="%optflags" \
+CFLAGS="%optflags" \
 %if %suse_version > 1500
 %ifarch %ix86
 %else
@@ -715,6 +695,7 @@
 %if %{with vidstab}
 	--enable-libvidstab \
 %endif
+	--enable-libvmaf \
 	--enable-libvorbis \
 	--enable-libv4l2 \
 	--enable-libvpx \
@@ -737,6 +718,9 @@
 	--enable-lv2 \
 %endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%ifarch x86_64
+	--enable-libmfx \
+%endif
 %endif
 	--enable-vaapi \
 	--enable-vdpau \
@@ -769,11 +753,11 @@
 	--enable-demuxers \
 	--disable-encoders \
 	--disable-decoders \
-	--disable-decoder=h264,hevc,vc1 \
+	--disable-decoder=mpeg4,h263,h264,hevc,vc1 \
 	--enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_encoders)" \
 	--enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_decoders)" \
 
-for i in H264 HEVC VC1; do
+for i in MPEG4 H263 H264 HEVC VC1; do
 	grep -q "#define CONFIG_${i}_DECODER 0" config.h
 done
 %endif
@@ -805,15 +789,24 @@
 	cp -a $i "$b/%_includedir/ffmpeg/private/$i"
 done
 
-%ldconfig_scriptlets -n libavcodec58_134
-%ldconfig_scriptlets -n libavdevice58_13
-%ldconfig_scriptlets -n libavfilter7_110
-%ldconfig_scriptlets -n libavformat58_76
-%ldconfig_scriptlets -n libavresample4_0
-%ldconfig_scriptlets -n libavutil56_70
-%ldconfig_scriptlets -n libpostproc55_9
-%ldconfig_scriptlets -n libswresample3_9
-%ldconfig_scriptlets -n libswscale5_9
+%post   -n libavcodec58_134 -p /sbin/ldconfig
+%postun -n libavcodec58_134 -p /sbin/ldconfig
+%post   -n libavdevice58_13 -p /sbin/ldconfig
+%postun -n libavdevice58_13 -p /sbin/ldconfig
+%post   -n libavfilter7_110 -p /sbin/ldconfig
+%postun -n libavfilter7_110 -p /sbin/ldconfig
+%post   -n libavformat58_76 -p /sbin/ldconfig
+%postun -n libavformat58_76 -p /sbin/ldconfig
+%post   -n libavresample4_0 -p /sbin/ldconfig
+%postun -n libavresample4_0 -p /sbin/ldconfig
+%post   -n libavutil56_70 -p /sbin/ldconfig
+%postun -n libavutil56_70 -p /sbin/ldconfig
+%post   -n libpostproc55_9 -p /sbin/ldconfig
+%postun -n libpostproc55_9 -p /sbin/ldconfig
+%post   -n libswresample3_9 -p /sbin/ldconfig
+%postun -n libswresample3_9 -p /sbin/ldconfig
+%post   -n libswscale5_9 -p /sbin/ldconfig
+%postun -n libswscale5_9 -p /sbin/ldconfig
 
 %files
 %doc Changelog CREDITS README.md

0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch Deleted

@@ -1,33 +0,0 @@
-From d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95 Mon Sep 17 00:00:00 2001
-From: Gyan Doshi <ffmpeg@gyani.pro>
-Date: Sat, 22 Feb 2025 10:38:53 +0530
-Subject: PATCH avcodec/libsvtav1: unbreak build with latest svtav1
-
-SVT-AV1 made a change in their public API in 988e930c but without a
-version bump or any other accessible marker, thus breaking ffmpeg build
-with current versions of SVT-AV1.
-
-They have finally bumped versions a month later, so check added.
----
- libavcodec/libsvtav1.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
-index 79b28eb4df..43fe531fde 100644
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -435,7 +435,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
- 
-     svt_enc->eos_flag = EOS_NOT_REACHED;
- 
-+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
-+    svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
-+#else
-     svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
-+#endif
-     if (svt_ret != EB_ErrorNone) {
-         return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
-     }
--- 
-2.48.1
-

0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch Deleted

@@ -1,46 +0,0 @@
-From 3bb00c0a420c3ce83c6fafee30270d69622ccad7 Mon Sep 17 00:00:00 2001
-From: Zhao Zhili <zhilizhao@tencent.com>
-Date: Tue, 20 Feb 2024 20:08:55 +0800
-Subject: PATCH avutil/hwcontext: Don't assume frames_uninit is reentrant
-References: https://bugzilla.opensuse.org/1223070
-References: CVE-2024-31578
-
-Fix heap use after free when vulkan_frames_init failed.
-
-Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
----
- libavutil/hwcontext.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
-index 1d2c2d7920..aa1329bf2b 100644
---- a/libavutil/hwcontext.c
-+++ b/libavutil/hwcontext.c
-@@ -359,7 +359,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref)
-     if (ctx->internal->hw_type->frames_init) {
-         ret = ctx->internal->hw_type->frames_init(ctx);
-         if (ret < 0)
--            goto fail;
-+            return ret;
-     }
- 
-     if (ctx->internal->pool_internal && !ctx->pool)
-@@ -369,14 +369,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref)
-     if (ctx->initial_pool_size > 0) {
-         ret = hwframe_pool_prealloc(ref);
-         if (ret < 0)
--            goto fail;
-+            return ret;
-     }
- 
-     return 0;
--fail:
--    if (ctx->internal->hw_type->frames_uninit)
--        ctx->internal->hw_type->frames_uninit(ctx);
--    return ret;
- }
- 
- int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref,
--- 
-2.44.0
-

ffmpeg-4-CVE-2023-6601-shim01-6b1f68cc.patch Deleted

@@ -1,39 +0,0 @@
-From 6b1f68ccb04d791f0250e05687c346a99ff47ea1 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Wed, 3 May 2023 13:08:35 +0200
-Subject: PATCH avformat/hls: fail on probing non hls/m3u8 file extensions
-
-Its unexpected that a .avi or other "standard" file turns into a playlist.
-The goal of this patch is to avoid this unexpected behavior and possible
-privacy or security differences.
-
-Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/hls.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/libavformat/hls.c b/libavformat/hls.c
-index 8a96a37ff9..11e345b280 100644
---- a/libavformat/hls.c
-+++ b/libavformat/hls.c
-@@ -2532,8 +2532,15 @@ static int hls_probe(const AVProbeData *p)
- 
-     if (strstr(p->buf, "#EXT-X-STREAM-INF:")     ||
-         strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
--        strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:"))
-+        strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) {
-+
-+        if (!av_match_ext(p->filename, "m3u8,hls,m3u")) {
-+            av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
-+            return 0;
-+        }
-+
-         return AVPROBE_SCORE_MAX;
-+    }
-     return 0;
- }
- 
--- 
-2.52.0
-

ffmpeg-4-CVE-2023-6601-shim02-954d16fa.patch Deleted

@@ -1,39 +0,0 @@
-From 954d16fa3f09a04c7917a1c69a5c3e283554cb1d Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 15 May 2023 00:56:10 +0200
-Subject: PATCH avformat/hls: Try to implement RFC8216 playlist refusal
-
-This should fix the regression since 6b1f68ccb04d791f0250e05687c346a99ff47ea1
-
-Should fix Ticket10353 (please test and report cases that still fail)
-
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/hls.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/libavformat/hls.c b/libavformat/hls.c
-index 11e345b280..425df3b26b 100644
---- a/libavformat/hls.c
-+++ b/libavformat/hls.c
-@@ -2534,7 +2534,16 @@ static int hls_probe(const AVProbeData *p)
-         strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
-         strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) {
- 
--        if (!av_match_ext(p->filename, "m3u8,hls,m3u")) {
-+        int mime_ok = p->mime_type && !(
-+            av_strcasecmp(p->mime_type, "application/vnd.apple.mpegurl") &&
-+            av_strcasecmp(p->mime_type, "audio/mpegurl") &&
-+            av_strcasecmp(p->mime_type, "audio/x-mpegurl") &&
-+            av_strcasecmp(p->mime_type, "application/x-mpegurl")
-+            );
-+
-+        if (!av_match_ext    (p->filename, "m3u8,hls,m3u") &&
-+             ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0 &&
-+            !mime_ok) {
-             av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
-             return 0;
-         }
--- 
-2.52.0
-

ffmpeg-4-CVE-2023-6601-shim03-a0cb5722.patch Deleted

@@ -1,35 +0,0 @@
-From a0cb5722fda9bd03b7be31a83b043966f0fd71b8 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 15 May 2023 21:28:26 +0200
-Subject: PATCH avformat/hls: Check mime_ok first
-
-This should be a few nano seconds faster (not measureable)
-But Collectively the whole humankind watching hls will safe a minute
-
-Found-by: Leo Izen
-
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/hls.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavformat/hls.c b/libavformat/hls.c
-index 425df3b26b..fc29ef0ca9 100644
---- a/libavformat/hls.c
-+++ b/libavformat/hls.c
-@@ -2541,9 +2541,9 @@ static int hls_probe(const AVProbeData *p)
-             av_strcasecmp(p->mime_type, "application/x-mpegurl")
-             );
- 
--        if (!av_match_ext    (p->filename, "m3u8,hls,m3u") &&
--             ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0 &&
--            !mime_ok) {
-+        if (!mime_ok &&
-+            !av_match_ext    (p->filename, "m3u8,hls,m3u") &&
-+             ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) {
-             av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
-             return 0;
-         }
--- 
-2.52.0
-

ffmpeg-4-CVE-2023-6601-shim04-5b630743.patch Deleted

@@ -1,44 +0,0 @@
-From 5b630743c625669b7c6ee4a01d4e0e8b51d7e636 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 15 May 2023 21:33:03 +0200
-Subject: PATCH avformat/hls: Better message from hls_probe()
-
-Found-by: Kacper Michajlow <kasper93@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/hls.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libavformat/hls.c b/libavformat/hls.c
-index fc29ef0ca9..2bc142510e 100644
---- a/libavformat/hls.c
-+++ b/libavformat/hls.c
-@@ -2536,17 +2536,23 @@ static int hls_probe(const AVProbeData *p)
- 
-         int mime_ok = p->mime_type && !(
-             av_strcasecmp(p->mime_type, "application/vnd.apple.mpegurl") &&
--            av_strcasecmp(p->mime_type, "audio/mpegurl") &&
-+            av_strcasecmp(p->mime_type, "audio/mpegurl")
-+            );
-+
-+        int mime_x = p->mime_type && !(
-             av_strcasecmp(p->mime_type, "audio/x-mpegurl") &&
-             av_strcasecmp(p->mime_type, "application/x-mpegurl")
-             );
- 
-         if (!mime_ok &&
-+            !mime_x &&
-             !av_match_ext    (p->filename, "m3u8,hls,m3u") &&
-              ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) {
--            av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
-+            av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension and non standard mime type\n");
-             return 0;
-         }
-+        if (mime_x)
-+            av_log(NULL, AV_LOG_WARNING, "mime type is not rfc8216 compliant\n");
- 
-         return AVPROBE_SCORE_MAX;
-     }
--- 
-2.52.0
-

ffmpeg-4-CVE-2023-6601.patch Deleted

@@ -1,29 +0,0 @@
-From d09f50c0f5f045dec35f0ca22c2212fae2378dba Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 15 May 2023 21:39:13 +0200
-Subject: PATCH avformat/hls: remove non standard hls extension
-
-Suggested-by: Kacper Michajlow <kasper93@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/hls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavformat/hls.c b/libavformat/hls.c
-index 2bc142510e..4fff4405e8 100644
---- a/libavformat/hls.c
-+++ b/libavformat/hls.c
-@@ -2546,8 +2546,8 @@ static int hls_probe(const AVProbeData *p)
- 
-         if (!mime_ok &&
-             !mime_x &&
--            !av_match_ext    (p->filename, "m3u8,hls,m3u") &&
--             ff_match_url_ext(p->filename, "m3u8,hls,m3u") <= 0) {
-+            !av_match_ext    (p->filename, "m3u8,m3u") &&
-+             ff_match_url_ext(p->filename, "m3u8,m3u") <= 0) {
-             av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension and non standard mime type\n");
-             return 0;
-         }
--- 
-2.52.0
-

ffmpeg-4-CVE-2024-12361.patch Deleted

@@ -1,32 +0,0 @@
-From 4065ff69a2ed49872f8694a03d0642b18c9d977c Mon Sep 17 00:00:00 2001
-From: Jiasheng Jiang <jiashengjiangcool@outlook.com>
-Date: Mon, 10 Jun 2024 14:18:11 +0000
-Subject: PATCH avcodec/mpegvideo_enc: Add check for
- av_packet_new_side_data()
-
-Add check for av_packet_new_side_data() to avoid null pointer
-dereference if allocation fails.
-
-Fixes: bdc1220eeb ("h263enc: Add an option for outputting info about MBs as side data")
-Signed-off-by: Jiasheng Jiang <jiashengjiangcool@outlook.com>
-Signed-off-by: Anton Khirnov <anton@khirnov.net>
----
- libavcodec/mpegvideo_enc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
-index 620ca08869..d33754d115 100644
---- a/libavcodec/mpegvideo_enc.c
-+++ b/libavcodec/mpegvideo_enc.c
-@@ -1825,6 +1825,8 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
-             s->mb_info_ptr = av_packet_new_side_data(pkt,
-                                  AV_PKT_DATA_H263_MB_INFO,
-                                  s->mb_width*s->mb_height*12);
-+            if (!s->mb_info_ptr)
-+                return AVERROR(ENOMEM);
-             s->prev_mb_info = s->last_mb_info = s->mb_info_size = 0;
-         }
- 
--- 
-2.44.0
-

ffmpeg-4-CVE-2025-10256.patch Deleted

@@ -1,23 +0,0 @@
-Author: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-Date:   Wed Aug 6 16:39:47 2025 +0000
-
-    libavfilter/af_firequalizer: Add check for av_malloc_array()
-    
-    Add check for the return value of av_malloc_array() to avoid potential NULL pointer dereference.
-    
-    Fixes: d3be186ed1 ("avfilter/firequalizer: add dumpfile and dumpscale option")
-    Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-diff a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c
---- a/libavfilter/af_firequalizer.c
-+++ b/libavfilter/af_firequalizer.c
-@@ -822,6 +822,8 @@ static int config_input(AVFilterLink *in
-     if (s->dumpfile) {
-         s->analysis_rdft = av_rdft_init(rdft_bits, DFT_R2C);
-         s->dump_buf = av_malloc_array(s->analysis_rdft_len, sizeof(*s->dump_buf));
-+        if (!s->dump_buf)
-+            return AVERROR(ENOMEM);
-     }
- 
-     s->analysis_buf = av_malloc_array(s->analysis_rdft_len, sizeof(*s->analysis_buf));

ffmpeg-4-CVE-2025-25473.patch Deleted

ffmpeg-4-CVE-2025-63757.patch Deleted

@@ -1,32 +0,0 @@
-From 95d890bf18e535e1ae5a9e24d801ca021e288804 Mon Sep 17 00:00:00 2001
-From: Jonathan Kang <jonathankang@gnome.org>
-Date: Thu, 15 Jan 2026 15:28:26 +0800
-Subject: PATCH swscale/output: Fix integer overflow in
- yuv2ya16_X_c_template()
-
----
- libswscale/output.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: ffmpeg-4.4.7/libswscale/output.c
-===================================================================
---- ffmpeg-4.4.7.orig/libswscale/output.c
-+++ ffmpeg-4.4.7/libswscale/output.c
-@@ -2191,7 +2191,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const i
-         int R, G, B;
- 
-         for (j = 0; j < lumFilterSize; j++)
--            Y += lumSrcji * lumFilterj;
-+            Y += lumSrcji * (unsigned)lumFilterj;
- 
-         for (j = 0; j < chrFilterSize; j++) {
-             U += chrUSrcji * chrFilterj;
-@@ -2206,7 +2206,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const i
-             A = 1 << 18;
- 
-             for (j = 0; j < lumFilterSize; j++)
--                A += alpSrcji * lumFilterj;
-+                A += alpSrcji * (unsigned)lumFilterj;
- 
-             if (A & 0xF8000000)
-                 A =  av_clip_uintp2(A, 27);

ffmpeg-4-CVE-2025-7700.patch Deleted

@@ -1,40 +0,0 @@
-From 35a6de137a39f274d5e01ed0e0e6c4f04d0aaf07 Mon Sep 17 00:00:00 2001
-From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-Date: Thu, 10 Jul 2025 16:26:39 +0000
-Subject: PATCH libavcodec/alsdec.c: Add check for av_malloc_array() and
- av_calloc()
-
-Add check for the return value of av_malloc_array() and av_calloc()
-to avoid potential NULL pointer dereference.
-
-Fixes: dcfd24b10c ("avcodec/alsdec: Implement floating point sample data decoding")
-
-Remodeled for ffmpeg-4.x - sckang@suse.com
-
-Index: ffmpeg-4.4.6/libavcodec/alsdec.c
-===================================================================
---- ffmpeg-4.4.6.orig/libavcodec/alsdec.c
-+++ ffmpeg-4.4.6/libavcodec/alsdec.c
-@@ -2116,8 +2116,8 @@ static av_cold int decode_init(AVCodecCo
-         ctx->nbits  = av_malloc_array(ctx->cur_frame_length, sizeof(*ctx->nbits));
-         ctx->mlz    = av_mallocz(sizeof(*ctx->mlz));
- 
--        if (!ctx->mlz || !ctx->acf || !ctx->shift_value || !ctx->last_shift_value
--            || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
-+        if (!ctx->larray || !ctx->nbits || !ctx->mlz || !ctx->acf || !ctx->shift_value
-+            || !ctx->last_shift_value || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
-             av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
-             ret = AVERROR(ENOMEM);
-             goto fail;
-@@ -2128,6 +2128,11 @@ static av_cold int decode_init(AVCodecCo
- 
-         for (c = 0; c < avctx->channels; ++c) {
-             ctx->raw_mantissac = av_mallocz_array(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa));
-+            if (!ctx->raw_mantissac) {
-+                av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
-+                ret = AVERROR(ENOMEM);
-+                goto fail;
-+            }
-         }
-     }
-

ffmpeg-4-CVE-2026-40962.patch Deleted

ffmpeg-4.2-dlopen-fdk_aac.patch Changed

@@ -1,14 +1,7 @@
----
- configure                  |    3 ++
- libavcodec/dlopen.h        |   12 ++++++++++
- libavcodec/libfdk-aacdec.c |   53 +++++++++++++++++++++++++++++++++++++++++++++
- libavcodec/libfdk-aacenc.c |   47 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 115 insertions(+)
-
-Index: ffmpeg-4.4.5/configure
+Index: ffmpeg-4.4.3/configure
 ===================================================================
---- ffmpeg-4.4.5.orig/configure
-+++ ffmpeg-4.4.5/configure
+--- ffmpeg-4.4.3.orig/configure
++++ ffmpeg-4.4.3/configure
 @@ -232,6 +232,7 @@ External library support:
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 no
@@ -22,10 +15,10 @@
      decklink
      libfdk_aac
 +    libfdk_aac_dlopen
+     openssl
      libtls
  "
- 
-@@ -6370,6 +6372,7 @@ enabled libdrm            && require_pkg
+@@ -6368,6 +6370,7 @@ enabled libdrm            && require_pkg
  enabled libfdk_aac        && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
                                 { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
                                   warn "using libfdk without pkg-config"; } }
@@ -33,10 +26,10 @@
  flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
  enabled libflite          && require libflite "flite/flite.h" flite_init $flite_extralibs
  enabled fontconfig        && enable libfontconfig
-Index: ffmpeg-4.4.5/libavcodec/dlopen.h
+Index: ffmpeg-4.4.3/libavcodec/dlopen.h
 ===================================================================
 --- /dev/null
-+++ ffmpeg-4.4.5/libavcodec/dlopen.h
++++ ffmpeg-4.4.3/libavcodec/dlopen.h
 @@ -0,0 +1,12 @@
 +#ifndef LOCALINC_DLOPEN_H
 +#define LOCALINC_DLOPEN_H
@@ -50,10 +43,10 @@
 +		goto error;
 +
 +#endif
-Index: ffmpeg-4.4.5/libavcodec/libfdk-aacdec.c
+Index: ffmpeg-4.4.3/libavcodec/libfdk-aacdec.c
 ===================================================================
---- ffmpeg-4.4.5.orig/libavcodec/libfdk-aacdec.c
-+++ ffmpeg-4.4.5/libavcodec/libfdk-aacdec.c
+--- ffmpeg-4.4.3.orig/libavcodec/libfdk-aacdec.c
++++ ffmpeg-4.4.3/libavcodec/libfdk-aacdec.c
 @@ -37,6 +37,54 @@
  #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
  #endif
@@ -121,10 +114,10 @@
      s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
      if (!s->handle) {
          av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-Index: ffmpeg-4.4.5/libavcodec/libfdk-aacenc.c
+Index: ffmpeg-4.4.3/libavcodec/libfdk-aacenc.c
 ===================================================================
---- ffmpeg-4.4.5.orig/libavcodec/libfdk-aacenc.c
-+++ ffmpeg-4.4.5/libavcodec/libfdk-aacenc.c
+--- ffmpeg-4.4.3.orig/libavcodec/libfdk-aacenc.c
++++ ffmpeg-4.4.3/libavcodec/libfdk-aacenc.c
 @@ -35,6 +35,48 @@
  #define FDKENC_VER_AT_LEAST(vl0, vl1) 0
  #endif

ffmpeg-CVE-2022-3109.patch Added

ffmpeg-CVE-2022-3341.patch Added

@@ -0,0 +1,44 @@
+diff --unified --recursive --text --new-file --color ffmpeg-4.4.3.old/libavformat/nutdec.c ffmpeg-4.4.3.new/libavformat/nutdec.c
+--- ffmpeg-4.4.3.old/libavformat/nutdec.c	2022-10-10 03:04:43.000000000 +0800
++++ ffmpeg-4.4.3.new/libavformat/nutdec.c	2023-01-20 15:33:38.060002545 +0800
+@@ -358,8 +358,12 @@
+         ret = AVERROR(ENOMEM);
+         goto fail;
+     }
+-    for (i = 0; i < stream_count; i++)
+-        avformat_new_stream(s, NULL);
++    for (i = 0; i < stream_count; i++) {
++        if (!avformat_new_stream(s, NULL)) {
++            ret = AVERROR(ENOMEM);
++            goto fail;
++        }
++    }
+ 
+     return 0;
+ fail:
+@@ -807,19 +811,23 @@
+     NUTContext *nut = s->priv_data;
+     AVIOContext *bc = s->pb;
+     int64_t pos;
+-    int initialized_stream_count;
++    int initialized_stream_count, ret;
+ 
+     nut->avf = s;
+ 
+     /* main header */
+     pos = 0;
++    ret = 0;
+     do {
++        if (ret == AVERROR(ENOMEM))
++            return ret;
++
+         pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1;
+         if (pos < 0 + 1) {
+             av_log(s, AV_LOG_ERROR, "No main startcode found.\n");
+             goto fail;
+         }
+-    } while (decode_main_header(nut) < 0);
++    } while ((ret = decode_main_header(nut)) < 0);
+ 
+     /* stream headers */
+     pos = 0;

ffmpeg-CVE-2022-3964.patch Added

@@ -0,0 +1,70 @@
+diff --unified --recursive --text --new-file --color ffmpeg-4.4.old/libavcodec/rpzaenc.c ffmpeg-4.4.new/libavcodec/rpzaenc.c
+--- ffmpeg-4.4.old/libavcodec/rpzaenc.c	2022-11-15 14:41:42.262978968 +0800
++++ ffmpeg-4.4.new/libavcodec/rpzaenc.c	2022-11-15 14:43:37.183516204 +0800
+@@ -204,7 +204,7 @@
+ 
+     // loop thru and compare pixels
+     for (y = 0; y < bi->block_height; y++) {
+-        for (x = 0; x < bi->block_width; x++){
++        for (x = 0; x < bi->block_width; x++) {
+             // TODO:  optimize
+             min_r = FFMIN(R(block_ptrx), min_r);
+             min_g = FFMIN(G(block_ptrx), min_g);
+@@ -276,7 +276,7 @@
+         return -1;
+ 
+     for (i = 0; i < bi->block_height; i++) {
+-        for (j = 0; j < bi->block_width; j++){
++        for (j = 0; j < bi->block_width; j++) {
+             x = GET_CHAN(block_ptrj, xchannel);
+             y = GET_CHAN(block_ptrj, ychannel);
+             sumx += x;
+@@ -323,7 +323,7 @@
+     int max_err = 0;
+ 
+     for (i = 0; i < bi->block_height; i++) {
+-        for (j = 0; j < bi->block_width; j++){
++        for (j = 0; j < bi->block_width; j++) {
+             int x_inc, lin_y, lin_x;
+             x = GET_CHAN(block_ptrj, xchannel);
+             y = GET_CHAN(block_ptrj, ychannel);
+@@ -418,7 +418,9 @@
+                                        uint16_t *dest_pixels,
+                                        const BlockInfo *bi, int block_counter)
+ {
+-    for (int y = 0; y < 4; y++) {
++    const int y_size = FFMIN(4, bi->image_height - bi->row * 4);
++
++    for (int y = 0; y < y_size; y++) {
+         memcpy(dest_pixels, src_pixels, 8);
+         dest_pixels += bi->rowstride;
+         src_pixels += bi->rowstride;
+@@ -728,13 +730,14 @@
+ 
+             if (err > s->sixteen_color_thresh) { // DO SIXTEEN COLOR BLOCK
+                 uint16_t *row_ptr;
+-                int rgb555;
++                int y_size, rgb555;
+ 
+                 block_offset = get_block_info(&bi, block_counter);
+ 
+                 row_ptr = &src_pixelsblock_offset;
++                y_size = FFMIN(4, bi.image_height - bi.row * 4);
+ 
+-                for (int y = 0; y < 4; y++) {
++                for (int y = 0; y < y_size; y++) {
+                     for (int x = 0; x < 4; x++){
+                         rgb555 = row_ptrx & ~0x8000;
+ 
+@@ -743,6 +746,11 @@
+                     row_ptr += bi.rowstride;
+                 }
+ 
++                for (int y = y_size; y < 4; y++) {
++                    for (int x = 0; x < 4; x++)
++                        put_bits(&s->pb, 16, 0);
++                }
++
+                 block_counter++;
+             } else { // FOUR COLOR BLOCK
+                 block_counter += encode_four_color_block(min_color, max_color,

ffmpeg-avcodec-libdav1d-don-t-repeatedly-parse-the-same-seq.patch Deleted

@@ -1,36 +0,0 @@
-commit e204846ec16c1ab34c7f3a681734cf5190433018
-Author: James Almer <jamrial@gmail.com>
-Date:   Fri Sep 3 13:50:32 2021 -0300
-
-    avcodec/libdav1d: fix compilation after recent libdav1d API changes
-
-    They were done in preparation for an upcoming 1.0 release.
-    Keep supporting previous releases for the time being.
-
-    Reviewed-by: BBB
-    Signed-off-by: James Almer <jamrial@gmail.com>
-
---- a/libavcodec/libdav1d.c
-+++ b/libavcodec/libdav1d.c
-@@ -202,6 +202,9 @@
-     Libdav1dContext *dav1d = c->priv_data;
-     Dav1dData *data = &dav1d->data;
-     Dav1dPicture pic = { 0 }, *p = &pic;
-+#if FF_DAV1D_VERSION_AT_LEAST(5,1)
-+    enum Dav1dEventFlags event_flags = 0;
-+#endif
-     int res;
-
-     if (!data->sz) {
-@@ -280,6 +283,11 @@
-     frame->linesize1 = p->stride1;
-     frame->linesize2 = p->stride1;
-
-+#if FF_DAV1D_VERSION_AT_LEAST(5,1)
-+    dav1d_get_event_flags(dav1d->c, &event_flags);
-+    if (c->pix_fmt == AV_PIX_FMT_NONE ||
-+        event_flags & DAV1D_EVENT_FLAG_NEW_SEQUENCE)
-+#endif
-     c->profile = p->seq_hdr->profile;
-     c->level = ((p->seq_hdr->operating_points0.major_level - 2) << 2)
-                | p->seq_hdr->operating_points0.minor_level;

ffmpeg-c99.patch Deleted

@@ -1,37 +0,0 @@
-From: Filip Kastl <fkastl@opensuse.org>
-Date: Fri, 26 Jul 2024 14:39:42 +0000
-
-I based the package patch on this bug report (there's a patch in
-the comments)
-https://bugs.gentoo.org/936433
-
-and on these patches
-https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318685.html
-http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5860a966d2fffbbda1af0014f0a4d37a21c4f2ca
-
-Index: ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
-===================================================================
---- ffmpeg-4.4.4.orig/libavutil/hwcontext_vaapi.c
-+++ ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
-@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFrames
-     uint32_t va_fourcc;
-     int err, i, j, k;
- 
--    unsigned long buffer_handle;
-+    uintptr_t buffer_handle;
-     VASurfaceAttribExternalBuffers buffer_desc;
-     VASurfaceAttrib attrs2 = {
-         {
-Index: ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
-===================================================================
---- ffmpeg-4.4.4.orig/libavutil/hwcontext_vulkan.c
-+++ ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
-@@ -862,7 +862,7 @@ static void free_exec_ctx(AVHWFramesCont
- 
-     av_freep(&cmd->queues);
-     av_freep(&cmd->bufs);
--    cmd->pool = NULL;
-+    cmd->pool = VK_NULL_HANDLE;
- }
- 
- static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)

ffmpeg-glslang-cxx17.patch Deleted

@@ -1,35 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2023-10-30 12:10:03.273303565 +0100
-
-glslang 13 needs C++17.
-
----
- configure               |    2 +-
- libavfilter/glslang.cpp |    1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: ffmpeg-4.4.4/configure
-===================================================================
---- ffmpeg-4.4.4.orig/configure
-+++ ffmpeg-4.4.4/configure
-@@ -5267,7 +5267,7 @@ fi
- 
- add_cppflags -D_ISOC99_SOURCE
- add_cxxflags -D__STDC_CONSTANT_MACROS
--check_cxxflags -std=c++11 || check_cxxflags -std=c++0x
-+check_cxxflags -std=c++17
- 
- # some compilers silently accept -std=c11, so we also need to check that the
- # version macro is defined properly
-Index: ffmpeg-4.4.4/libavfilter/glslang.cpp
-===================================================================
---- ffmpeg-4.4.4.orig/libavfilter/glslang.cpp
-+++ ffmpeg-4.4.4/libavfilter/glslang.cpp
-@@ -16,6 +16,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+#include <cassert>
- #include <pthread.h>
- 
- extern "C" {

glslang16.patch Deleted

@@ -1,25 +0,0 @@
-From: <ej@inai.de>
-Date: 2025-09-29 09:24:26.262746656 +0200
-
-ffmpeg never used the remapper so... so why link it in the first place?!
----
- configure |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: ffmpeg-4.4.6/configure
-===================================================================
---- ffmpeg-4.4.6.orig/configure
-+++ ffmpeg-4.4.6/configure
-@@ -6391,10 +6391,10 @@ enabled libfreetype       && require_pkg
- enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
- enabled libglslang && { check_lib libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
-                             -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
--                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
-+                            -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
-                         require libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
-                             -lglslang -lOSDependent -lHLSL -lOGLCompiler \
--                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
-+                            -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
- enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
-                                require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
- enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do

pcmbluray-bigendian.patch Deleted

@@ -1,46 +0,0 @@
-From 347a70f101be28f8d78e8fd62ffc3a78324f49e9 Mon Sep 17 00:00:00 2001
-From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-Date: Thu, 28 Mar 2024 05:35:36 +0100
-Subject: PATCH avcodec/pcm-bluray/dvd: Use correct pointer types on BE
-
-Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
----
- libavcodec/pcm-bluray.c |    4 ++--
- libavcodec/pcm-dvd.c    |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: ffmpeg-4.4.8/libavcodec/pcm-bluray.c
-===================================================================
---- ffmpeg-4.4.8.orig/libavcodec/pcm-bluray.c
-+++ ffmpeg-4.4.8/libavcodec/pcm-bluray.c
-@@ -169,7 +169,7 @@ static int pcm_bluray_decode_frame(AVCod
-             samples *= num_source_channels;
-             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
- #if HAVE_BIGENDIAN
--                bytestream2_get_buffer(&gb, dst16, buf_size);
-+                bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
- #else
-                 do {
-                     *dst16++ = bytestream2_get_be16u(&gb);
-@@ -189,7 +189,7 @@ static int pcm_bluray_decode_frame(AVCod
-             if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
-                 do {
- #if HAVE_BIGENDIAN
--                    bytestream2_get_buffer(&gb, dst16, avctx->channels * 2);
-+                    bytestream2_get_buffer(&gb, (uint8_t*)dst16, avctx->channels * 2);
-                     dst16 += avctx->channels;
- #else
-                     channel = avctx->channels;
-Index: ffmpeg-4.4.8/libavcodec/pcm-dvd.c
-===================================================================
---- ffmpeg-4.4.8.orig/libavcodec/pcm-dvd.c
-+++ ffmpeg-4.4.8/libavcodec/pcm-dvd.c
-@@ -152,7 +152,7 @@ static void *pcm_dvd_decode_samples(AVCo
-     switch (avctx->bits_per_coded_sample) {
-     case 16: {
- #if HAVE_BIGENDIAN
--        bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
-+        bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
-         dst16 += blocks * s->block_size / 2;
- #else
-         int samples = blocks * avctx->channels;

vmaf-trim-usr-local.patch Added

@@ -0,0 +1,17 @@
+---
+ libavfilter/vf_libvmaf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ffmpeg-4.4.1/libavfilter/vf_libvmaf.c
+===================================================================
+--- ffmpeg-4.4.1.orig/libavfilter/vf_libvmaf.c
++++ ffmpeg-4.4.1/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+ 
+ static const AVOption libvmaf_options = {
+-    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+     {"log_path",  "Set the file path to be used to store logs.",                        OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"log_fmt",  "Set the format of the log (csv, json or xml).",                       OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"enable_transform",  "Enables transform for computing vmaf.",                      OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},

_scmsync.obsinfo Deleted

build.specials.obscpio Deleted

enable_decoders Changed

@@ -1,210 +1,27 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
 aac
-aasc
 ac3
-acelp_kelvin
-adpcm_4xm
-adpcm_adx
-adpcm_afc
-adpcm_agm
-adpcm_aica
-adpcm_argo
-adpcm_ct
-adpcm_dtk
-adpcm_ea
-adpcm_ea_maxis_xa
-adpcm_ea_r1
-adpcm_ea_r2
-adpcm_ea_r3
-adpcm_ea_xas
-adpcm_g722
-adpcm_g726
-adpcm_g726le
-adpcm_ima_acorn
-adpcm_ima_alp
-adpcm_ima_amv
-adpcm_ima_apc
-adpcm_ima_apm
-adpcm_ima_cunning
-adpcm_ima_dat4
-adpcm_ima_dk3
-adpcm_ima_dk4
-adpcm_ima_ea_eacs
-adpcm_ima_ea_sead
-adpcm_ima_iss
-adpcm_ima_moflex
-adpcm_ima_mtf
-adpcm_ima_oki
-adpcm_ima_qt
-adpcm_ima_rad
-adpcm_ima_smjpeg
-adpcm_ima_ssi
-adpcm_ima_wav
-adpcm_ima_ws
-adpcm_ms
-adpcm_mtaf
-adpcm_psx
-adpcm_sbpro_2
-adpcm_sbpro_3
-adpcm_sbpro_4
-adpcm_swf
-adpcm_thp
-adpcm_thp_le
-adpcm_vima
-adpcm_xa
-adpcm_xmd
-adpcm_yamaha
-adpcm_zork
-alac
-alias_pix
-amrnb # opencore-amr
-amrwb # opencore-amr
-amv
-anm
 ansi # trivial
-anull
-apac
-ape
-apng # animated png
-arbc
-argo
+apng
 ass # trivial
-asv1
-asv2
-atrac1
-atrac3
-atrac3al
-atrac3p
-atrac3pal
-aura
-aura2
-av1 # libaom
-av1_nvdec # passthrough
-av1_qsv # passthrough
-av1_vaapi # passthrough
 ayuv # trivial
-bethsoftvid # trivial
-bfi # trivial
-bink
-binkaudio_dct
-binkaudio_rdft
-bintext
-bitpacked # trivial
 bmp # trivial
-bmv_audio
-bmv_video
-bonk
-brender_pix
-c93
-cbd2_dpcm
-ccaption
-cdgraphics
-cdtoons
-cdxl
-cinepak
-clearvideo
-cljr
-cook
-cpia
-cscd
-cyuv
-dca
-dds
-derf_dpcm
-dfa
-dfpwm
 dirac # dirac
-dnxhd
-dolby_e
-dpx
-dsd_lsbf
-dsd_msbf
-dsicinaudio
-dsicinvideo
-dss_sp
-dvaudio
-dvbsub
-dvdsub
-dvvideo
-dxa
-dxtory
-eacmv
-eamad
-eatgq
-eatgv
-eatqi
-eightbps
-eightsvx_exp
-eightsvx_fib
-escape124
-escape130
-evrc
 exr # openEXR
 ffv1 # ffmpeg
 ffvhuff # ffmpeg
 ffwavesynth # pseudo
-fits
 flac # libFLAC
-flashsv
-flashsv2
-flic
-flv
-fmvc
-fourxm
-ftr # fdk-aac
-g723_1
-g729
-gdv
-gem
 gif # libpng
-gremlin_dpcm
 gsm # libgsm
-gsm_ms
-h261
-h263
-h263_v4l2m2m # passthrough
-h263i
-h263p
-hap
-hca
-hcom
-hdr
-hnm4_video
-hq_hqa
-hqx
 huffyuv # trivial+zlib
-hymt # huffyuv-mt
-iac
-idcin
-idf
-iff_ilbm
 ilbc # ilbc
-imc
-indeo2
-indeo3
-indeo4
-indeo5
-interplay_acm
-interplay_dpcm
-interplay_video
-ipu
-jacosub
-jpeg2000 # openjpeg2
-jpegls
-jv
-kgv1
-kmvc
-lagarith
 libaom # libaom

enable_encoders Changed

@@ -1,104 +1,38 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
-a64multi
-a64multi5
 aac
-ac3
-adpcm_adx
-adpcm_argo
-adpcm_g722
-adpcm_g726
-adpcm_g726le
-adpcm_ima_alp
-adpcm_ima_amv
-adpcm_ima_apm
-adpcm_ima_qt
-adpcm_ima_ssi
-adpcm_ima_wav
-adpcm_ima_ws
-adpcm_ms
-adpcm_swf
-adpcm_yamaha
-alac
-alias_pix
-amv
-anull
 apng # libpng
 ass # trivial
-asv1
-asv2
-av1_nvenc
-av1_vaapi
 ayuv # trival
-bitpacked # trivial
 bmp # trivial
-cinepak
-cljr
-dca
-dfpwm
-dnxhd
-dpx
-dvdsub
-dvvideo
-exr
 ffv1
 ffvhuff # trivial+zlib
 flac # libFLAC
-flashsv
-flashsv2
-flv
-g723_1
 gif # libpng
-h261
-h263
-h263_v4l2m2m # passthrough
-h263p
-hdr
 huffyuv # trivial+zlib
-ilbc # ilbc
-jpeg2000
 jpegls
 libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
-libgsm_ms # libgsm
-libjxl # libjxl
 libmp3lame # lame
-libopencore_amrnb # opencore-amr
-libopenh264 # passthrough/dlopen
 libopenjpeg # openjpeg
 libopus # opus
 librav1e # rav1e
 libschroedinger # schroedinger
 libspeex # speex
-libsvtav1 # SVT-AV1
+libsvtav1
 libtheora # libtheora
 libtwolame # twolame
-libvo_amrwbenc # vo-amrwbenc
 libvorbis # libvorbis
-libvpx_vp8 # libvpx
-libvpx_vp9 # libvpx
-libwebp # libwebp
-libwebp_anim # libwebp
-libxvid # xvidcore
+libvpx_vp8
+libvpx_vp9
+libwebp
+libwebp_anim
 mjpeg # mjpegtools
-mjpeg_qsv # passthrough
-mjpeg_vaapi # passthrough
-mlp
 mp2 # twolame
 mp2fixed # twolame
 mpeg1video
-mpeg2_qsv
-mpeg2_vaapi
 mpeg2video
-mpeg4
-mpeg4_v4l2m2m # passthrough
-msmpeg4v1
-msmpeg4v2
-msmpeg4v3
-msnsiren
-msvideo1
-nellymoser
 opus # opus
 pam
 pbm # trivial
@@ -130,66 +64,25 @@
 pcx
 pgm # trivial
 pgmyuv # trivial
-phm # trivial
 png # libpng
 ppm # trivial
-qoi
-qtrle
-r10k # trivial
-r210 # trivial
-ra_144
 rawvideo # trivial
-roq
-roq_dpcm
-rpza
-rv10
-rv20
-s302m
-sbc
 sgi # trivial
-siren
-smc
-snow
-sonic
-sonic_ls
-speedhq
 srt # trivial
 ssa # trivial
-subrip # trivial
 sunrast # trivial
-svq1
 targa # trivial
 text # trivial
 tiff # libtiff
-truehd
-tta
-ttml
-utvideo
 v210 # trivial
 v308 # trivial
 v408 # trivial
 v410 # trivial
-vc2 # dirac
-vnull # trivial
 vorbis # libvorbis
-vp8_qsv # passthrough
-vp8_v4l2m2m # passthrough
-vp8_vaapi # passthrough
-vp9_qsv # passthrough
-vp9_vaapi # passthough
-wavpack
-wbmp
 webvtt # trivial
-wmav1
-wmav2
-wmv1
-wmv2
 wrapped_avframe # passthrough
-xbm # trivial
-xface
-xsub
+xbm # (X11)
 xwd # xwd
 y41p # trivial
 yuv4 # trivial
 zlib # zlib
-zmbv # dosbox

ffmpeg-4.4.8.tar.xz -> ffmpeg-4.4.3.tar.xz Changed

ffmpeg-4.4.3.tar.xz.asc Added

ffmpeg-4.4.8.tar.xz.asc Deleted