aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrplHaz4 <PrplHaz4@users.noreply.github.com>2019-05-20 19:28:50 +0000
committerGitHub <noreply@github.com>2019-05-20 19:28:50 +0000
commit691e0e02bff5afc09ecc75d3c272a64f3b1f5ecf (patch)
tree296cd52d412df18d457933bbed25ac6f41e417c3
parentUpdate link and license for ShinobiCE (diff)
downloadawesome-selfhosted-691e0e02bff5afc09ecc75d3c272a64f3b1f5ecf.tar.gz
awesome-selfhosted-691e0e02bff5afc09ecc75d3c272a64f3b1f5ecf.zip
combine license tags
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 8c5e32bc..78065ed4 100644
--- a/README.md
+++ b/README.md
@@ -892,7 +892,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https
- [Odd Networks](http://oddnetworks.com) - Open source video management system (VMS) and API for collections and videos with supporting SDKs for Roku, Apple iOS/tvOS, Google Android, and Amazon FireTV. ([Source Code](https://github.com/oddnetworks/oddworks)) `MIT` `Nodejs`
- [PeerTube](https://joinpeertube.org/en/) - Decentralized video streaming platform using P2P (BitTorrent) directly in the web browser. ([Source Code](https://github.com/Chocobozzz/PeerTube)) `AGPL-3.0` `Nodejs`
- [Restreamer](https://datarhei.github.io/restreamer/) - Restreamer allows you to do h.264 real-time video streaming on your website without a streaming provider. ([Source Code](https://github.com/datarhei/restreamer)) `Apache-2.0` `Nodejs/Docker`
-- [ShinobiCE](https://gitlab.com/Shinobi-Systems/ShinobiCE) - Open Source CCTV software written in Node with both IP and local camera support. ([Source Code](https://gitlab.com/Shinobi-Systems/ShinobiCE) `GPL-3.0` `AGPL-3.0` `Nodejs`
+- [ShinobiCE](https://gitlab.com/Shinobi-Systems/ShinobiCE) - Open Source CCTV software written in Node with both IP and local camera support. ([Source Code](https://gitlab.com/Shinobi-Systems/ShinobiCE) `AGPL-3+GPL-3` `Nodejs`
- [Streama](https://streamaserver.org/) - Self hosted streaming media server. ([Source Code](https://github.com/streamaserver/streama)) `MIT` `Java`
- [VideoLAN Client (VLC)](https://www.videolan.org/) - Cross-platform multimedia player client and server supporting most multimedia files as well as DVDs, Audio CDs, VCDs, and various streaming protocols. ([Source Code](https://github.com/videolan/vlc)) `Multiple` `C`
- [Zoneminder](https://www.zoneminder.com/) - Closed-circuit television (CCTV) software application which supports IP, USB and Analog cameras. ([Source Code](https://github.com/ZoneMinder/ZoneMinder)) `GPL-2.0` `PHP`