Merge pull request #54392 from ivan/nv-codec
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
This commit is contained in:
commit
a8e19088da
@ -1,7 +1,7 @@
|
||||
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
|
||||
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
|
||||
, freefont_ttf, freetype, libass, libpthreadstubs, mujs
|
||||
, lua, libuchardet, libiconv ? null, darwin
|
||||
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
|
||||
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, wayland ? null
|
||||
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_4 freetype libass libpthreadstubs
|
||||
luaEnv libuchardet mujs
|
||||
luaEnv libuchardet mujs nv-codec-headers
|
||||
] ++ optional alsaSupport alsaLib
|
||||
++ optional archiveSupport libarchive
|
||||
++ optional bluraySupport libbluray
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user