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

ffmpeg-full: Enable vo-amrwbenc (#37432)

Browse Source
This commit is contained in:
Adam Copp 2018-04-17 16:41:47 +01:00 committed by Matthew Justin Bauer
parent 2f0f9b4d0f
commit 4d3cec0a57
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -119,7 +119,7 @@
#, utvideo ? null # Ut Video de/encoder #, utvideo ? null # Ut Video de/encoder
, vid-stab ? null # Video stabilization , vid-stab ? null # Video stabilization
#, vo-aacenc ? null # AAC encoder #, vo-aacenc ? null # AAC encoder
#, vo-amrwbenc ? null # AMR-WB encoder , vo-amrwbenc ? null # AMR-WB encoder
, wavpack ? null # Wavpack encoder , wavpack ? null # Wavpack encoder
, x264 ? null # H.264/AVC encoder , x264 ? null # H.264/AVC encoder
, x265 ? null # H.265/HEVC encoder , x265 ? null # H.265/HEVC encoder
@ -380,7 +380,7 @@ stdenv.mkDerivation rec {
#(enableFeature (utvideo != null && gplLicensing) "libutvideo") #(enableFeature (utvideo != null && gplLicensing) "libutvideo")
(enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0 (enableFeature (vid-stab != null && gplLicensing) "libvidstab") # Actual min. version 2.0
#(enableFeature (vo-aacenc != null && version3Licensing) "libvo-aacenc") #(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 (wavpack != null) "libwavpack")
(enableFeature (x264 != null && gplLicensing) "libx264") (enableFeature (x264 != null && gplLicensing) "libx264")
(enableFeature (x265 != null && gplLicensing) "libx265") (enableFeature (x265 != null && gplLicensing) "libx265")
@ -405,7 +405,8 @@ stdenv.mkDerivation rec {
libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr 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 ] ++ optional openglExtlib libGLU_combined
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva