[rpms/ffmpeg] epel10: Update to 7.1.5.

[Dominik 'Rathann' Mierzejewski <dominik@greysector.net>]

            A new commit has been pushed.

            Repo   : rpms/ffmpeg
            Branch : epel10
            Commit : fd467d13519f421fd8e852b82187900a75cea22e
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2026-06-23T18:18:08+02:00
            Stats  : +7/-35 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/fd467d13519f421fd8e852b82187900a75cea22e?branch=epel10

            Log:
            Update to 7.1.5.

- Drop merged fix for CVE-2025-22921.

---
diff --git a/ffmpeg-CVE-2025-22921.patch b/ffmpeg-CVE-2025-22921.patch
deleted file mode 100644
index 3a522c8..0000000
--- a/ffmpeg-CVE-2025-22921.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7f9c7f9849a2155224711f0ff57ecdac6e4bfb57 Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Wed, 1 Jan 2025 23:58:39 -0300
-Subject: [PATCH] avcodec/jpeg2000dec: clear array length when freeing it
-
-Fixes NULL pointer dereferences.
-Fixes ticket #11393.
-
-Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/jpeg2000dec.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
-index e5e897a29f..b82d85d5ee 100644
---- a/libavcodec/jpeg2000dec.c
-+++ b/libavcodec/jpeg2000dec.c
-@@ -1521,6 +1521,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
-                 }
-             }
-             av_freep(&cblk->lengthinc);
-+            cblk->nb_lengthinc = 0;
-         }
-     }
-     // Save state of stream
--- 
-2.48.1
-

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7d86934..6199f2e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -94,7 +94,7 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
-Version:        7.1.4
+Version:        7.1.5
 Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
@@ -113,9 +113,6 @@ Patch1:         ffmpeg-codec-choice.patch
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112
 Patch2:         ffmpeg-allow-fdk-aac-free.patch
 
-# Backport fix for CVE-2025-22921
-Patch10:        https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7f9c7f9849a2155224711f0ff57ecdac6e4bfb57#/ffmpeg-CVE-2025-22921.patch
-
 # Add first_dts getter to libavformat for Chromium
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=2240127
 # Reference: https://crbug.com/1306560
@@ -917,6 +914,10 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Mon Jun 22 2026 Dominik Mierzejewski <dominik@greysector.net> - 7.1.5-1
+- Update to 7.1.5.
+- Drop merged fix for CVE-2025-22921.
+
 * Thu May 07 2026 Dominik Mierzejewski <dominik@greysector.net> - 7.1.4-1
 - Update to 7.1.4.
 

diff --git a/sources b/sources
index 73db6c9..dfa87b7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ffmpeg-7.1.4.tar.xz) = f78122efff098fc75d0213021bfc5ddbf94dd993970cab846bd9e0dfa72564beeae5a65616e4394f1591e28472409ea404f1390fee2780ebddc39ba69a97f9a9
-SHA512 (ffmpeg-7.1.4.tar.xz.asc) = 0dace0354707c46c61658034f1581fc01a61501e66fc4fea3f856dbd036fa0a5d66378e97d39b0c0a900e092094c55161a4d74be1f4a7f6fbf1c2a8c2e4cbf2d
+SHA512 (ffmpeg-7.1.5.tar.xz) = c0649ef9edd4176b90459e92b636be18077ca898f24fe1a8dc60f3c5fd58cf718db9720bbe804c6f6894453e21c0625d706ea37d3523fcb40d61779763d7d965
+SHA512 (ffmpeg-7.1.5.tar.xz.asc) = d441d8a25c7d6de06e5a78d7a4ea72c75dfd31de73ea899939ed1599212acf042710a8ed1e34d3d77b6c75b904f2f95bac03875ce55b04b2951e5b67b72882a4
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165