aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/ffmpeg
diff options
context:
space:
mode:
authorIvan Kozik <ivan@ludios.org>2019-01-20 22:59:14 +0000
committerIvan Kozik <ivan@ludios.org>2019-02-11 00:32:43 +0000
commitde8f760fbd4d8895047c090516841d259b145719 (patch)
tree7b7810a1d91ec11940bfa60aab5c9ca5a46f9f3a /pkgs/development/libraries/ffmpeg
parent5c09d977c794d9243ddac17f6c429b5432431f8f (diff)
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
NVIDIA users can now use `mpv --hwdec=nvdec` to play videos that the software decoders cannot keep up with.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
-rw-r--r--pkgs/development/libraries/ffmpeg/generic.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index d11ef732a01f..72929e127bcc 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus, speex
+, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
- libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
+ libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM