diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
| commit | c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d (patch) | |
| tree | d1a10ef8a3e8fe00ac12ac1437ec46a856521084 /pkgs/development/libraries/ffmpeg-full/default.nix | |
| parent | 798c2d8bc1e947eb26e249b326bfaba49a91b735 (diff) | |
| parent | 3ee58112693c11cd8157495e09714cf9ddb599b3 (diff) | |
| download | nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.gz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.bz2 nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.lz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.xz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.zst nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg-full/default.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 666aafef7f4..1cbcc5471e0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -118,6 +118,7 @@ #, shine ? null # Fixed-point MP3 encoder , soxr ? null # Resampling via soxr , speex ? null # Speex de/encoder +, srt ? null # Secure Reliable Transport (SRT) protocol #, twolame ? null # MP2 encoder #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization @@ -355,6 +356,7 @@ stdenv.mkDerivation rec { #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") (enableFeature (librsvg != null) "librsvg") + (enableFeature (srt != null) "libsrt") (enableFeature (libssh != null) "libssh") (enableFeature (libtheora != null) "libtheora") (enableFeature (if isLinux then libv4l != null else false) "libv4l2") @@ -418,7 +420,7 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] |