Updating x264, and adding x264 support to mplayer and ffmpeg.

svn path=/nixpkgs/trunk/; revision=21451
2010-04-30 08:33:47 +00:00
parent 9b48c69f85
commit 7b6ce0f9df
4 changed files with 20 additions and 12 deletions
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig}:

 stdenv.mkDerivation {
  name = "ffmpeg-0.5.1";
@@ -22,9 +22,10 @@ stdenv.mkDerivation {
    --enable-libtheora
    --enable-libvorbis
    --enable-libspeex
+    --enable-libx264
  '';

-  buildInputs = [faad2 libtheora speex libvorbis];
+  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig];

  meta = {
    homepage = http://www.ffmpeg.org/;