* Updated ffmpeg, faac and xvidcore.

* ffmpeg: enable support for faac (disabled by default because faac is
  non-free).
* faac: use an external mp4v2 because the internal one doesn't build.

svn path=/nixpkgs/trunk/; revision=27240
This commit is contained in:
Eelco Dolstra
2011-05-12 20:43:33 +00:00
parent 166e5a8fbf
commit 03055c5300
4 changed files with 24 additions and 20 deletions
@@ -1,11 +1,11 @@
{stdenv, fetchurl, nasm}:
stdenv.mkDerivation rec {
name = "xvidcore-1.2.2";
name = "xvidcore-1.3.1";
src = fetchurl {
url = http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2;
sha256 = "04bd1clv90i5pdwh6mz3mskyzmxyx5l2nx7lyyb8nhw9whnn0ap4";
url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
sha256 = "0r1x00fgm7cbb7i9p17p9l0p4b82gig6sm0mbs6qrz84kd2fh6n5";
};
preConfigure = ''