MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ffmpeg: enable x265 support

Browse source
This commit is contained in:
Nikolay Amiantov 2016-04-09 14:00:30 +03:00
parent dddafe61eb
commit d023e15cfc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -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