diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-30 11:12:27 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-30 11:13:37 +0100 |
| commit | 0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3 (patch) | |
| tree | 3a93edaa4134e50749e4f8522ff63d53f007543d /pkgs/development/libraries/ffmpeg | |
| parent | 13fab57d127bf70a338901b422da32e562d16889 (diff) | |
| download | nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar.gz nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar.bz2 nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar.lz nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar.xz nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.tar.zst nixlib-0f485bd0db89b0529e3641f49c8c6e0cfa45dcf3.zip | |
ffmpeg_0_10: update from 0.10.14 to 0.10.15
cc @lovek323
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/0.10.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index 8ffe2daebf6c..556a41e2dca9 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10.14"; + name = "ffmpeg-0.10.15"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy"; + sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + branch = "0.10"; }; } |