ffmpeg_2_3: use 2.2 instead of 2.3

2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).
This commit is contained in:
Vladimír Čunát 2014-12-16 21:31:29 +01:00
parent cbe467ef99
commit 304484a753
2 changed files with 4 additions and 4 deletions

View file

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
version = "2.3.3";
version = "2.2.11";
name = "ffmpeg-${version}";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r";
};
subtitleSupport = config.ffmpeg.subtitle or true;

View file

@ -5135,7 +5135,7 @@ let
vpxSupport = !stdenv.isMips;
};
ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { };
ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { };
ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { };
@ -11097,7 +11097,7 @@ let
};
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_2_3;
ffmpeg = ffmpeg_2_2;
};
vmpk = callPackage ../applications/audio/vmpk { };