aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/ffmpeg
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2020-02-08 16:00:37 +0900
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-02-09 09:23:57 +0100
commit4ac6c244ccfaf69f1c0a15c6194cb22e3a4f4388 (patch)
treefc57d45cd33d25855d60666da28375313738f234 /pkgs/development/libraries/ffmpeg
parent35b403bf127d0f32e2dfd7b425e4901c000f558a (diff)
ffmpeg: fix vdpauSupport=false
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 26a3206d2056..bc423dbd7cae 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
(ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
(ifMinVer "3.4" (enableFeature vaapiSupport "libdrm"))
- "--enable-vdpau"
+ (enableFeature vdpauSupport "vdpau")
"--enable-libvorbis"
(ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
(ifMinVer "2.4" "--enable-lzma")
@@ -171,7 +171,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 nv-codec-headers
+ libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
] ++ optionals openglSupport [ libGL libGLU ]
++ optional libmfxSupport intel-media-sdk
++ optional vpxSupport libaom