diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-03 13:44:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 13:44:13 +0100 |
| commit | 8b8480483710b2be5161a0d6329499342ab51c82 (patch) | |
| tree | c9521425925e33980fe8c74d32609dee419fd10a | |
| parent | e4225cad4397d2b654a223cfbe0193b946bb0dfd (diff) | |
| parent | f94e21c4e8783c3f5cd1a3edfc0acca79bd4179f (diff) | |
| download | nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar.gz nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar.bz2 nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar.lz nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar.xz nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.tar.zst nixpkgs-8b8480483710b2be5161a0d6329499342ab51c82.zip | |
Merge pull request #114829 from TredwellGit/ffmpeg
ffmpeg: 4.3.1 -> 4.3.2
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 916ea2772e1..a09ad0e871e 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -246,11 +246,6 @@ stdenv.mkDerivation rec { # this should go away in the next release patches = [ - (fetchpatch { - url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315"; - sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o="; - name = "fix_libsrt.patch"; - }) # Patch ffmpeg for svt-av1 until version 4.4 (fetchpatch { url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 2cc409fc037..95207b5386f 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.3.1"; + version = "4.3.2"; branch = "4.3"; - sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l"; + sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) |