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

Merge pull request #88561 from zowoq/ffmpeg

Browse Source 
ffmpeg{_4,-full}: 4.2.2 -> 4.2.3, ffmpeg_2_8: 2.8.15 -> 2.8.16
This commit is contained in:
Mario Rodas 2020-05-26 23:29:43 -05:00 committed by GitHub
commit 6050c0bf45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec {
pname = "ffmpeg-full";
version = "4.2.2";
version = "4.2.3";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb";
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
};
patches = [ ./prefer-libdav1d-over-libaom.patch ];

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

@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (rec {
version = "${branch}.15";
version = "${branch}.16";
branch = "2.8";
sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m";
sha256 = "0lfmfd6rhywis9rblkxv33rpwfga9xv261fq4cn3pkx1izih7ybk";
} // args)

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

@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "4.2.2";
version = "4.2.3";
branch = "4.2";
sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)