mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
ffmpeg (_1 and default _2): minor update, incl. security
CVE-2014-{5271,5272}
This commit is contained in:
parent
91db3f6b45
commit
32f95153a1
|
@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
|
||||||
assert freetypeSupport -> freetype != null;
|
assert freetypeSupport -> freetype != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ffmpeg-1.2.7";
|
name = "ffmpeg-1.2.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||||
sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
|
sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
|
||||||
};
|
};
|
||||||
|
|
||||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ffmpeg-2.3.2";
|
name = "ffmpeg-2.3.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||||
sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4";
|
sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
|
||||||
};
|
};
|
||||||
|
|
||||||
subtitleSupport = config.ffmpeg.subtitle or true;
|
subtitleSupport = config.ffmpeg.subtitle or true;
|
||||||
|
|
Loading…
Reference in a new issue