about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-03-17 22:53:08 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-03-17 22:56:19 +0100
commitda4fca4ce411fdce79fee63558c61dfd8666598a (patch)
treecd4f3efdf6151dc9f8b82c0460f4b52ccb6bcde6
parentf202729d53ccf38e7e04114b7c602d2f0e42444c (diff)
downloadnixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar.gz
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar.bz2
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar.lz
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar.xz
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.tar.zst
nixlib-da4fca4ce411fdce79fee63558c61dfd8666598a.zip
ffmpeg (0.10): minor update
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05)

Conflicts:
	pkgs/development/libraries/ffmpeg/0.10.nix
-rw-r--r--pkgs/development/libraries/ffmpeg/0.10.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index f356bceaf401..99c823e7b297 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.11";
+  name = "ffmpeg-0.10.12";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1l1nyvsfafl9w0falv1hcm65r2rlxyb59har0rkrrpi56fj1ma4r";
+    sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that