diff options
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/1.1.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/1.1.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f8..7cb83db5e8d 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { "--enable-swscale" "--disable-ffplay" "--enable-shared" + "--enable-avresample" "--enable-runtime-cpudetect" ] ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" @@ -62,6 +65,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; |