diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-20 13:00:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 13:00:18 +0200 |
| commit | f45fa31ab2a438ba75c3c40cf411c9c6293d1039 (patch) | |
| tree | a549ad235e5c7e4fdcca8f1c682b4de21f2268ce /pkgs/development/libraries/ffmpeg | |
| parent | a54bafe50afe0e7a01579def8ae52cd624b1d48c (diff) | |
| parent | 065a8102c9867e85e47af0d94596a5ff24b9257d (diff) | |
| download | nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar.gz nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar.bz2 nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar.lz nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar.xz nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.tar.zst nixpkgs-f45fa31ab2a438ba75c3c40cf411c9c6293d1039.zip | |
Merge pull request #120577 from MatthewCroughan/ffmpeg-srt
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d52abd4ab09..f20f1695627 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,6 +2,7 @@ , 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 +, srt ? null , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null , libaomSupport ? false, libaom ? null @@ -94,6 +95,7 @@ stdenv.mkDerivation rec { # Build flags "--enable-shared" (ifMinVer "0.6" "--enable-pic") + (ifMinVer "4.0" (enableFeature (srt != null) "libsrt")) (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" ] ++ @@ -171,7 +173,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex srt nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom |