ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66527 from primeos/ffmpeg_4-add-support-for-av1-decoding

Browse Source 
ffmpeg_4: Enable support for AV1 decoding via dav1d by default
This commit is contained in:
Michael Weiss 2019-08-26 11:51:04 +02:00 committed by GitHub
commit f2023c7ef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , 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 , openglSupport ? false, libGLU_combined ? null
# Build options # Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@ -145,6 +145,7 @@ stdenv.mkDerivation rec {
(ifMinVer "2.8" "--enable-libopus") (ifMinVer "2.8" "--enable-libopus")
"--enable-libspeex" "--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265") (ifMinVer "2.8" "--enable-libx265")
(ifMinVer "4.2" (enableFeature (dav1d != null) "libdav1d"))
# Developer flags # Developer flags
(enableFeature debugDeveloper "debug") (enableFeature debugDeveloper "debug")
(enableFeature optimizationsDeveloper "optimizations") (enableFeature optimizationsDeveloper "optimizations")
@ -170,7 +171,8 @@ stdenv.mkDerivation rec {
++ optional isLinux alsaLib ++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks ++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau ++ 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; enableParallelBuilding = true;