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

Merge pull request #28054 from kiloreux/ffmpeg-opencore

Browse Source 
ffmpeg-full: enable opencore-amr
This commit is contained in:
Jörg Thalheim 2017-08-10 20:31:37 +01:00 committed by GitHub
commit 8a2977676d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@
, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support
, openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code
#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
#, opencv ? null # Video filtering
, openglExtlib ? false, mesa ? null # OpenGL rendering
#, openh264 ? null # H.264/AVC encoder
@ -155,7 +155,7 @@
*
* Not packaged:
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
* libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame
* libmxf libnut libquvi nvenc opencl openh264 oss shine twolame
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
*
* Need fixes to support Darwin:
@ -360,7 +360,7 @@ stdenv.mkDerivation rec {
(enableFeature nvenc "nvenc")
(enableFeature (openal != null) "openal")
#(enableFeature opencl "opencl")
#(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb")
#(enableFeature (opencv != null) "libopencv")
(enableFeature openglExtlib "opengl")
#(enableFeature (openh264 != null) "openh264")
@ -403,7 +403,7 @@ stdenv.mkDerivation rec {
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
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
libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
] ++ optional openglExtlib mesa
++ optionals nonfreeLicensing [ fdk_aac openssl ]