diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
| commit | feb648ce59ffbed94c58133eb7aa2761992a35e1 (patch) | |
| tree | 59d45f1cce7aa4809d9601124bcc9006a80204b7 /pkgs/development/libraries/ffmpeg-full | |
| parent | a02be2bd85b37ed8b257e969d9439357844baa24 (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
| download | nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.gz nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.bz2 nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.lz nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.xz nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.tar.zst nixpkgs-feb648ce59ffbed94c58133eb7aa2761992a35e1.zip | |
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f991418ffda..d2ef075beee 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -119,7 +119,7 @@ #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization #, vo-aacenc ? null # AAC encoder -#, vo-amrwbenc ? null # AMR-WB encoder +, vo-amrwbenc ? null # AMR-WB encoder , wavpack ? null # Wavpack encoder , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder @@ -380,7 +380,7 @@ stdenv.mkDerivation rec { #(enableFeature (utvideo != null && gplLicensing) "libutvideo") (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 #(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") - #(enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") + (enableFeature (vo-amrwbenc != null && version3Licensing) "libvo-amrwbenc") (enableFeature (wavpack != null) "libwavpack") (enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x265 != null && gplLicensing) "libx265") @@ -405,7 +405,8 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib + samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + zeromq4 zlib ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva |