diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-09 14:00:30 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-09 14:02:43 +0300 |
| commit | d023e15cfcb27c1fa52a9312626c03c0bacb40a6 (patch) | |
| tree | 07b977364fa123fd32aedd8c3c9a9537805d4aa4 /pkgs/development | |
| parent | dddafe61ebcb3ab347a6e34c2b00449081d5be24 (diff) | |
| download | nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar.gz nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar.bz2 nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar.lz nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar.xz nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.tar.zst nixlib-d023e15cfcb27c1fa52a9312626c03c0bacb40a6.zip | |
ffmpeg: enable x265 support
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index c62278729a7f..2d79fb6a641e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, xvidcore, zlib, libopus +, x264, x265, xvidcore, zlib, libopus , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -129,6 +129,7 @@ stdenv.mkDerivation rec { "--enable-libxvid" "--enable-zlib" (ifMinVer "2.8" "--enable-libopus") + (ifMinVer "2.8" "--enable-libx265") # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -142,7 +143,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libopus + libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva |