From 8dc509bf40840a08a5b9ae6bd4f1e22f6781a36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 26 May 2026 13:47:35 -0700 Subject: [PATCH] ffmpeg_7: 7.1.3 -> 7.1.4 Changelog: https://github.com/FFmpeg/FFmpeg/blob/n7.1.4/Changelog --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 1b4b045d1ae1..7d1108c4e159 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -26,8 +26,8 @@ let }; v7 = { - version = "7.1.3"; - hash = "sha256-1w4OSlz88D2pnZVXQcI4uyX+triNK0NXzlsyt7GGSLU="; + version = "7.1.4"; + hash = "sha256-GDN0+tJY8Nap9UkNUfzqT9cGV1IVCuy5Du/64G+8QdE="; }; v8 = { version = "8.1"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f43f4bfa5c41..cf268620780b 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 "7.0" && lib.versionOlder version "8.1") [ + ++ optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.1.4") [ (fetchpatch2 { name = "unbreak-hardcoded-tables.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1d47ae65bf6df91246cbe25c997b25947f7a4d1d"; @@ -492,7 +492,7 @@ stdenv.mkDerivation ( hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4="; }) ] - ++ optionals (lib.versionAtLeast version "7.1" && lib.versionOlder version "8.0") [ + ++ optionals (lib.versionAtLeast version "7.1" && lib.versionOlder version "7.1.4") [ (fetchpatch2 { name = "lcevcdec-4.0.0-compat.patch"; url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch";