ffmpeg 7.1.3

Co-authored-by: Bjørn Lie <bjorn.lie@gmail.com>
Co-committed-by: Bjørn Lie <bjorn.lie@gmail.com>

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

@@ -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
-

ffmpeg-7-CVE-2025-25473.patch

@@ -1,26 +0,0 @@
-From c08d300481b8ebb846cd43a473988fdbc6793d1b Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Fri, 17 Jan 2025 00:05:31 -0300
-Subject: [PATCH] avformat/avformat: also clear FFFormatContext packet queue
- when closing a muxer
-
-packet_buffer is used in mux.c, and if a muxing process fails at a point where
-packets remained in said queue, they will leak.
-
-Fixes ticket #11419
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavformat/avformat.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/libavformat/avformat.c
-+++ b/libavformat/avformat.c
-@@ -184,6 +184,7 @@
-     av_dict_free(&si->id3v2_meta);
-     av_packet_free(&si->pkt);
-     av_packet_free(&si->parse_pkt);
-+    avpriv_packet_list_free(&si->packet_buffer);
-     av_freep(&s->streams);
-     av_freep(&s->stream_groups);
-     ff_flush_packet_queue(s);

ffmpeg-7.1.1.tar.xz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmfE+J4YHGZmbXBlZy1k
-ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYNAwH/3i5n8X6+6Gw+1U+k6Lfwe4t
-d1AmG/XyJd3ZkqnSXmtpW/p/DoHaRQLTJMHq/5jWi0Dcpr8M8VD0pZxzEksfy0XY
-xHEqKXRG37/SyoiH39+BXWOSry4shIhzTVfmQi9QGZ0i69J+ZOpP1cImWz2c6QBM
-Q2FMPv1QMVNR2UWHDGgYAvvg2qfJfGgIdQQtvAQe1q3co6LuaZC0ndgoNmNyuPLV
-nNmsoetZucoNC4M7kcevyssrRMDi+yHk5X86LfV/cBY+BKP9X8u8pieXrnctSYAh
-qqBnsg4jSj3fB96QvsFsdbUWEECKm4/gWJngMQTMk2Tg0RpQAwfHvp21Lppo/xw=
-=xzGf
------END PGP SIGNATURE-----

ffmpeg-7.1.3.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmkfva4YHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljY2wAH/RdHMcvBOVNv/KTz6ANTAIdf
+2Kuc2aiR8bsIPEGElv5udmwD9B/L6a1PuZ02alLjZEgfjzrAmauMc/gKMA6qQLYH
+JN8S7dMSZXN8FmBcTZ+1aPLQG9TA1f952rUOFV/yj2LDxGP22DrBmwIgEk/leeAh
+EHcS7NBA51XJOgLkqmvhqbAakiL9C2DrPlvvdHMs9klni7fQoHcr0bJuuGrzx/PQ
+0ygV0V2Arbi6SkZHrrWQNV3cgqMYyKkUMwYqQf65RcwZan7fYXLxGB+4B9cz4zcx
+BTfmB+7IelSw/KQ7YsSsGtPX2/oXuJdqf8jX7CFtFWYOBgx9RsfZP65PeIQmq5k=
+=oOOV
+-----END PGP SIGNATURE-----

ffmpeg-7.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sat Jan 10 19:44:19 UTC 2026 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.1.3
+  * No release notes were provided
+  * lavc/aarch64: Fix addp overflow in ff_pred16x16_plane_neon_10
+  * swscale/output: Fix integer overflow in yuv2ya16_X_c_template()
+  * avformat/avformat: clear FFFormatContext packet queue when
+    closing a muxer
+- Delete ffmpeg-7-CVE-2025-25473.patch (merged)
+
+-------------------------------------------------------------------
+Fri Sep 19 18:44:35 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 7.1.2:
+  * avcodec/librsvgdec: fix compilation with librsvg 2.50.3
+  * libavfilter/af_firequalizer: Add check for av_malloc_array()
+  * avcodec/libsvtav1: unbreak build with latest svtav1
+  * avformat/hls: Fix Youtube AAC
+  * Various bugfixes.
+- Drop patches fixed upstream:
+  * 0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
+  * ffmpeg-CVE-2025-7700.patch
+
+-------------------------------------------------------------------
+Wed Jul 23 13:28:49 UTC 2025 - Hans-Peter Jansen <hp@urpla.net>
+
+- Add vvenc build conditional
+
 -------------------------------------------------------------------
 Wed Jul 23 07:01:22 UTC 2025 - SongChuan Kang <sckang@suse.com>
 
@@ -294,6 +323,7 @@ Mon Jan 15 11:11:08 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>
   * VAAPI AV1 encoder
   * ffprobe XML output schema changed to account for multiple variable-fields elements within the same parent element
   * ffprobe -output_format option added as an alias of -of
+  * avformat/hls: remove non standard hls extension. (CVE-2023-6601, bsc#1220545)
 - Remove patch6 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
 - Prefer libvpl to libmfx: the latter is deprecated
 - Delete ffmpeg-6-private-devel package as it is only needed to build libav-tools

ffmpeg-7.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ffmpeg-7
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -60,6 +60,7 @@
 %bcond_with    fdk_aac_dlopen
 %bcond_with    opencore
 %bcond_with    smbclient
+%bcond_with    vvenc
 %bcond_with    x264
 %bcond_with    x265
 %bcond_with    xvid
@@ -96,7 +97,7 @@
 %define _major_expected 8
 
 Name:           ffmpeg-7
-Version:        7.1.1
+Version:        7.1.3
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later
@@ -119,10 +120,7 @@ Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         work-around-abi-break.patch
 Patch10:        ffmpeg-chromium.patch
 Patch15:        11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
-Patch18:        ffmpeg-7-CVE-2025-25473.patch
 Patch19:        ffmpeg-7-CVE-2025-22921.patch
-Patch20:        0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
-Patch21:        ffmpeg-CVE-2025-7700.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  nasm
@@ -222,6 +220,9 @@ BuildRequires:  pkgconfig(opencore-amrnb)
 %if %{with amrwb}
 BuildRequires:  pkgconfig(vo-amrwbenc)
 %endif
+%if %{with vvenc}
+BuildRequires:  vvenc-devel
+%endif
 %if %{with x264}
 BuildRequires:  pkgconfig(x264)
 %endif
@@ -662,6 +663,9 @@ LDFLAGS="%_lto_cflags" \
 %if %{with amrwb}
 	--enable-libvo-amrwbenc \
 %endif
+%if %{with vvenc}
+	--enable-libvvenc \
+%endif
 %if %{with x264}
 	--enable-libx264 \
 %endif
@@ -821,7 +825,7 @@ done
 #
 #!BcntSyncTag:  ffmpeg-7
 Name:           ffmpeg-7-mini
-Version:        7.1.1
+Version:        7.1.3
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later

ffmpeg-CVE-2025-7700.patch

@@ -1,45 +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")
-Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavcodec/alsdec.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
-index 734eec8bf8..97b04a95f9 100644
---- a/libavcodec/alsdec.c
-+++ b/libavcodec/alsdec.c
-@@ -2119,8 +2119,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
-         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");
-             return AVERROR(ENOMEM);
-         }
-@@ -2132,6 +2132,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
- 
-         for (c = 0; c < channels; ++c) {
-             ctx->raw_mantissa[c] = av_calloc(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa));
-+            if (!ctx->raw_mantissa[c]) {
-+                av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
-+                return AVERROR(ENOMEM);
-+            }
-         }
-     }
- 
--- 
-2.25.1
-

work-around-abi-break.patch

@@ -13,11 +13,12 @@ ffmpeg, which can cause inadvertent mixing of library versions on
 openSUSE, and precompiled Linux distributions in general.
 
 Upstream says "we only add new functions" - which is ok in its own
-right. verdefs, if you have them, *must*not* change under any
-circumstances, but that is what they broke: the set of symbols
-included in the "LIBAVFORMAT_59" verdef changed between 5.0 and 5.1.
+right. New symbols must be in a new verdef section though, existing
+sections *must*not* change under *any* circumstances, but that is
+what they broke: the set of symbols included in the "LIBAVFORMAT_59"
+verdef changed between 5.0 and 5.1.
 
-$ abidiff abidiff /usr/lib64/libavformat.so.59.16.100 usr/lib64/libavformat.so.59.27.100
+$ abidiff /usr/lib64/libavformat.so.59.16.100 usr/lib64/libavformat.so.59.27.100
 Functions changes summary: 0 Removed, 0 Changed, 0 Added function
 Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 Function symbols changes summary: 0 Removed, 1 Added function symbol not referenced by debug info