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

ffmpeg_3: 3.1.4 -> 3.1.6

Browse Source
This commit is contained in:
Graham Christensen 2017-02-02 08:47:01 -05:00
parent c69d1dbab6
commit 16f8f0d313
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,7 @@ stdenv.mkDerivation rec {
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optionals nvenc [ nvidia-video-sdk ] ++ optionals nvenc [ nvidia-video-sdk ]
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration ]; MediaToolbox VideoDecodeAcceleration ];
# Build qt-faststart executable # Build qt-faststart executable
@ -463,11 +463,11 @@ stdenv.mkDerivation rec {
description = "A complete, cross-platform solution to record, convert and stream audio and video"; description = "A complete, cross-platform solution to record, convert and stream audio and video";
homepage = https://www.ffmpeg.org/; homepage = https://www.ffmpeg.org/;
longDescription = '' longDescription = ''
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
mux, demux, stream, filter and play pretty much anything that humans and machines mux, demux, stream, filter and play pretty much anything that humans and machines
have created. It supports the most obscure ancient formats up to the cutting edge. have created. It supports the most obscure ancient formats up to the cutting edge.
No matter if they were designed by some standards committee, the community or No matter if they were designed by some standards committee, the community or
a corporation. a corporation.
''; '';
license = ( license = (
if nonfreeLicensing then if nonfreeLicensing then

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

@ -5,9 +5,9 @@
}@args: }@args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}.4"; version = "${branch}.6";
branch = "3.1"; branch = "3.1";
sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw"; sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
}) })