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

ffmpeg-2.2: update (still used by vlc)

This commit is contained in:
Vladimír Čunát 2015-02-05 11:19:18 +01:00
parent 1982ac0b65
commit 474aeb0b3d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ffmpeg/2.2.x.nix
View File

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
version = "2.2.11";
version = "2.2.12";
name = "ffmpeg-${version}";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r";
sha256 = "1a1ki0v7c94l68blbimh3xl5adz599ql8nrdm2q0g285qy6mqxck";
};
subtitleSupport = config.ffmpeg.subtitle or true;
@ -104,6 +104,6 @@ stdenv.mkDerivation rec {
license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
branch = "2.3";
branch = "2.2";
};
}