diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 22:45:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 22:45:27 +0000 |
| commit | 1485c905f72a60663556303c134275ccba73c47a (patch) | |
| tree | bd5aecdd86328fc627360b2f5049d973cab817d3 /pkgs/development/libraries/ffmpeg | |
| parent | 44ac9e249c336b81a001b7d7f9392eff2ab1e2a2 (diff) | |
| download | nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar.gz nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar.bz2 nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar.lz nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar.xz nixpkgs-1485c905f72a60663556303c134275ccba73c47a.tar.zst nixpkgs-1485c905f72a60663556303c134275ccba73c47a.zip | |
* ffmpeg: build with faad2 support. However, vlc still won't play
mp4a audio. * faad2: latest version. * vlc: fix the hard-coded OSD font path name. Dunno why they don't use fontconfig. svn path=/nixpkgs/trunk/; revision=14501
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 375bf8c26f6..33f003095a6 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, faad2}: stdenv.mkDerivation { name = "ffmpeg-0.5"; @@ -19,8 +19,11 @@ stdenv.mkDerivation { --enable-swscale --disable-ffserver --disable-ffplay + --enable-libfaad ''; + buildInputs = [faad2]; + meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; |