JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91697 from lukegb/ffmpeg-full-libsrt

Browse Source 
ffmpeg: add libsrt support
This commit is contained in:
Niklas Hambüchen 2020-06-28 02:43:56 +02:00 committed by GitHub
commit 2451111d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -118,6 +118,7 @@
#, shine ? null # Fixed-point MP3 encoder #, shine ? null # Fixed-point MP3 encoder
, soxr ? null # Resampling via soxr , soxr ? null # Resampling via soxr
, speex ? null # Speex de/encoder , speex ? null # Speex de/encoder
, srt ? null # Secure Reliable Transport (SRT) protocol
#, twolame ? null # MP2 encoder #, twolame ? null # MP2 encoder
#, utvideo ? null # Ut Video de/encoder #, utvideo ? null # Ut Video de/encoder
, vid-stab ? null # Video stabilization , vid-stab ? null # Video stabilization
@ -355,6 +356,7 @@ stdenv.mkDerivation rec {
#(enableFeature (libnut != null) "libnut") #(enableFeature (libnut != null) "libnut")
(enableFeature (libopus != null) "libopus") (enableFeature (libopus != null) "libopus")
(enableFeature (librsvg != null) "librsvg") (enableFeature (librsvg != null) "librsvg")
(enableFeature (srt != null) "libsrt")
(enableFeature (libssh != null) "libssh") (enableFeature (libssh != null) "libssh")
(enableFeature (libtheora != null) "libtheora") (enableFeature (libtheora != null) "libtheora")
(enableFeature (if isLinux then libv4l != null else false) "libv4l2") (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 libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr 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 zeromq4 zlib
] ++ optionals openglExtlib [ libGL libGLU ] ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]