diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-25 22:18:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 22:18:23 -0400 |
| commit | 810f2ba1f3160b76722da7fb44a123046ab8fb75 (patch) | |
| tree | 71dbb420224775e2c8fa97022768693d448760a2 /pkgs/development/libraries/ffmpeg-full | |
| parent | 38c6c7c8a3f343415b1860848b7297b738818d36 (diff) | |
| parent | 410c30077c01b1205a26d23f3e74793dc2941f3f (diff) | |
Merge pull request #57758 from midchildan/add-mediasdk
intel-media-sdk: init at 18.4.1
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 1ab0b543400f7..306b4e22cfc95 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -75,7 +75,7 @@ , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -#, libmfx ? null # Hardware acceleration vis libmfx +, libmfx ? null # Hardware acceleration vis libmfx , libmodplug ? null # ModPlug support , libmysofa ? null # HRTF support via SOFAlizer #, libnut ? null # NUT (de)muxer, native (de)muser exists @@ -156,12 +156,13 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame + * libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg, - * pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs + * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh + * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab + * wavpack x265 xavs * * Not supported: * stagefright-h264(android only) @@ -343,7 +344,7 @@ stdenv.mkDerivation rec { (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (libiconv != null) "iconv") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - #(enableFeature (libmfx != null) "libmfx") + (enableFeature (if isLinux then libmfx != null else false) "libmfx") (enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") @@ -416,6 +417,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optional (isLinux && libmfx != null) libmfx ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration |