JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #114829 from TredwellGit/ffmpeg

Browse Source 
ffmpeg: 4.3.1 -> 4.3.2
This commit is contained in:
Sandro 2021-03-03 13:44:13 +01:00 committed by GitHub
commit 8b84804837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/ffmpeg-full/default.nix
View File

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

4
pkgs/development/libraries/ffmpeg/4.nix
View File

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