ffmpeg: 1.2.8 -> 1.2.9
This commit is contained in:
parent
3f4e433ddf
commit
8ad2a13bdf
@ -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.8";
|
name = "ffmpeg-1.2.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||||
sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
|
sha256 = "02wsnlix92a9k8wf3b4bad3a14v1c5iiz0fv6wlk1zn82cp93paw";
|
||||||
};
|
};
|
||||||
|
|
||||||
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
|
||||||
@ -100,7 +100,9 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.ffmpeg.org/;
|
homepage = http://www.ffmpeg.org/;
|
||||||
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";
|
||||||
|
license = if faacSupport then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
|
||||||
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
|
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
|
||||||
|
platforms = stdenv.lib.platforms.unix;
|
||||||
branch = "1";
|
branch = "1";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user