From e6d8fec34cb6f76cfb0578821a5d211bed11edff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 26 May 2026 13:44:48 -0700
Subject: [PATCH] ffmpeg_6: 6.1.4 -> 6.1.5

Changelog: https://github.com/FFmpeg/FFmpeg/blob/n6.1.5/Changelog
---
 pkgs/development/libraries/ffmpeg/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/generic.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index cd003aecd13e..1b4b045d1ae1 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,8 +21,8 @@ let
   };
 
   v6 = {
-    version = "6.1.4";
-    hash = "sha256-hqLohRNkoy5jGlaNlCRVoPwwsW7TDgCX1OKsGIM6IYg=";
+    version = "6.1.5";
+    hash = "sha256-iLAqdv1Dn7qln8Ag5lbGKOrWQZVLNREAgXbdDbHiMjc=";
   };
 
   v7 = {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0b9142ed67a9..f43f4bfa5c41 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -453,7 +453,7 @@ stdenv.mkDerivation (
       ++ optionals (lib.versionAtLeast version "5.1") [
         ./nvccflags-cpp14.patch
       ]
-      ++ optionals (lib.versionAtLeast version "5.1" && lib.versionOlder version "8.1") [
+      ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "8.1") [
         (fetchpatch2 {
           name = "unbreak-hardcoded-tables.patch";
           url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d";