jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding lame to ffmpeg so it can encode mp3, and allow it also build its assembly

Browse Source 
routines adding yasm, and --enable-runtime-cpudetection, that I hope will end in
faster executions

svn path=/nixpkgs/trunk/; revision=21971
This commit is contained in:
Lluís Batlle i Rossell 2010-05-25 18:39:24 +00:00
parent a63c1f4c8a
commit adc9f57c71
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ffmpeg/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore}:
{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm}:
stdenv.mkDerivation {
name = "ffmpeg-0.5.1";
@ -24,9 +24,11 @@ stdenv.mkDerivation {
--enable-libspeex
--enable-libx264
--enable-libxvid
--enable-libmp3lame
--enable-runtime-cpudetect
'';
buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore];
buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm];
meta = {
homepage = http://www.ffmpeg.org/;

3
pkgs/top-level/all-packages.nix
View File

@ -3738,7 +3738,8 @@ let
};
ffmpeg = import ../development/libraries/ffmpeg {
inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore;
inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore
lame yasm;
};
fftw = import ../development/libraries/fftw {