diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-08-26 11:51:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-26 11:51:04 +0200 |
| commit | f2023c7ef11e7d6f17ba1401c894831c42124844 (patch) | |
| tree | 66494d959a0cdd4b0307bf55bb8c38b9d57503ac | |
| parent | 79af8ac2661093dbff7e79691a29f60eb1756c62 (diff) | |
| parent | aed96948292120b5a380f64ccdef430c50cca483 (diff) | |
Merge pull request #66527 from primeos/ffmpeg_4-add-support-for-av1-decoding
ffmpeg_4: Enable support for AV1 decoding via dav1d by default
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 84260f3f57c73..cf2dc56b90a1e 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, nv-codec-headers +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -145,6 +145,7 @@ stdenv.mkDerivation rec { (ifMinVer "2.8" "--enable-libopus") "--enable-libspeex" (ifMinVer "2.8" "--enable-libx265") + (ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d")) # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -170,7 +171,8 @@ stdenv.mkDerivation rec { ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau - ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); + ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL) + ++ optional (reqMin "4.2") dav1d; enableParallelBuilding = true; |