Merge pull request #13822 from acowley/ffmpeg3

ffmpeg-full: 2.8.5 -> 3.0
This commit is contained in:
joachifm 2016-03-12 23:20:28 +00:00
commit 423a65b0cd

View File

@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
version = "2.8.5";
version = "3.0";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi";
};
patchPhase = ''patchShebangs .'';
@ -449,7 +449,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A complete, cross-platform solution to record, convert and stream audio and video";
homepage = http://www.ffmpeg.org/;
homepage = https://www.ffmpeg.org/;
longDescription = ''
FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
mux, demux, stream, filter and play pretty much anything that humans and machines