Merge pull request #152960 from andresilva/ffmpeg-zimg
ffmpeg: enable libzimg
This commit is contained in:
commit
1bcd2863e3
|
@ -132,6 +132,7 @@
|
|||
, xavs ? null # AVS encoder
|
||||
, xvidcore ? null # Xvid encoder, native encoder exists
|
||||
, zeromq4 ? null # Message passing
|
||||
, zimg ? null
|
||||
, zlib ? null
|
||||
, vulkan-loader ? null
|
||||
, glslang ? null
|
||||
|
@ -403,6 +404,7 @@ stdenv.mkDerivation rec {
|
|||
(enableFeature (xavs != null && gplLicensing) "libxavs")
|
||||
(enableFeature (xvidcore != null && gplLicensing) "libxvid")
|
||||
(enableFeature (zeromq4 != null) "libzmq")
|
||||
(enableFeature (zimg != null) "libzimg")
|
||||
(enableFeature (zlib != null) "zlib")
|
||||
(enableFeature (isLinux && vulkan-loader != null) "vulkan")
|
||||
(enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang")
|
||||
|
@ -431,7 +433,7 @@ stdenv.mkDerivation rec {
|
|||
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
|
||||
libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
|
||||
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
|
||||
zeromq4 zlib
|
||||
zeromq4 zimg zlib
|
||||
] ++ optionals openglExtlib [ libGL libGLU ]
|
||||
++ optionals nonfreeLicensing [ fdk_aac openssl ]
|
||||
++ optional ((isLinux || isFreeBSD) && libva != null) libva
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
|
||||
, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
|
||||
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr
|
||||
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
|
||||
, x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d
|
||||
, srt ? null
|
||||
, openglSupport ? false, libGLU ? null, libGL ? null
|
||||
, libmfxSupport ? false, intel-media-sdk ? null
|
||||
|
@ -152,6 +152,7 @@ stdenv.mkDerivation rec {
|
|||
(ifMinVer "1.2" "--enable-libsoxr")
|
||||
"--enable-libx264"
|
||||
"--enable-libxvid"
|
||||
"--enable-libzimg"
|
||||
"--enable-zlib"
|
||||
(ifMinVer "2.8" "--enable-libopus")
|
||||
"--enable-libspeex"
|
||||
|
@ -174,7 +175,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
|
||||
libvorbis xz soxr x264 x265 xvidcore zlib libopus speex srt nv-codec-headers
|
||||
libvorbis xz soxr x264 x265 xvidcore zimg zlib libopus speex srt nv-codec-headers
|
||||
] ++ optionals openglSupport [ libGL libGLU ]
|
||||
++ optional libmfxSupport intel-media-sdk
|
||||
++ optional libaomSupport libaom
|
||||
|
|
Loading…
Reference in a new issue