pyrox.dev
Merge pull request #152960 from andresilva/ffmpeg-zimg
ffmpeg: enable libzimg
+3
-1
pkgs/development/libraries/ffmpeg-full/default.nix
+3
-1
pkgs/development/libraries/ffmpeg-full/default.nix
···
132
132
, xavs ? null # AVS encoder
133
133
, xvidcore ? null # Xvid encoder, native encoder exists
134
134
, zeromq4 ? null # Message passing
135
+
, zimg ? null
135
136
, zlib ? null
136
137
, vulkan-loader ? null
137
138
, glslang ? null
···
403
404
(enableFeature (xavs != null && gplLicensing) "libxavs")
404
405
(enableFeature (xvidcore != null && gplLicensing) "libxvid")
405
406
(enableFeature (zeromq4 != null) "libzmq")
407
+
(enableFeature (zimg != null) "libzimg")
406
408
(enableFeature (zlib != null) "zlib")
407
409
(enableFeature (isLinux && vulkan-loader != null) "vulkan")
408
410
(enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang")
···
431
433
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
432
434
libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
433
435
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
434
-
zeromq4 zlib
436
+
zeromq4 zimg zlib
435
437
] ++ optionals openglExtlib [ libGL libGLU ]
436
438
++ optionals nonfreeLicensing [ fdk_aac openssl ]
437
439
++ optional ((isLinux || isFreeBSD) && libva != null) libva
+3
-2
pkgs/development/libraries/ffmpeg/generic.nix
+3
-2
pkgs/development/libraries/ffmpeg/generic.nix
···
1
1
{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
2
2
, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
3
3
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr
4
-
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
4
+
, x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d
5
5
, srt ? null
6
6
, openglSupport ? false, libGLU ? null, libGL ? null
7
7
, libmfxSupport ? false, intel-media-sdk ? null
···
152
152
(ifMinVer "1.2" "--enable-libsoxr")
153
153
"--enable-libx264"
154
154
"--enable-libxvid"
155
+
"--enable-libzimg"
155
156
"--enable-zlib"
156
157
(ifMinVer "2.8" "--enable-libopus")
157
158
"--enable-libspeex"
···
174
175
175
176
buildInputs = [
176
177
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
177
-
libvorbis xz soxr x264 x265 xvidcore zlib libopus speex srt nv-codec-headers
178
+
libvorbis xz soxr x264 x265 xvidcore zimg zlib libopus speex srt nv-codec-headers
178
179
] ++ optionals openglSupport [ libGL libGLU ]
179
180
++ optional libmfxSupport intel-media-sdk
180
181
++ optional libaomSupport libaom