Merge pull request #152960 from andresilva/ffmpeg-zimg

ffmpeg: enable libzimg

authored by

Kevin Cox and committed by
GitHub
1bcd2863 c6f7ec4c

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