Merge remote-tracking branch 'origin/vlc'
This commit is contained in:
		
						commit
						d7d73aa5d6
					
				|  | @ -840,6 +840,7 @@ See also <https://en.wikipedia.org/wiki/List_of_streaming_media_systems>, <https | |||
| - [Rygel](https://wiki.gnome.org/action/show/Projects/Rygel) - Rygel is a UPnP AV MediaServer that allows you to easily share audio, video, and pictures. Media player software may use Rygel to become a MediaRenderer that may be controlled remotely by a UPnP or DLNA Controller. `GPL-3.0` `C` | ||||
| - [Shinobi](https://moeiscool.github.io/Shinobi/) - Open Source CCTV software written in Node with both IP and local camera support. ([Source Code](https://github.com/moeiscool/Shinobi)) `GPL-2.0` `Nodejs` | ||||
| - [Streama](https://github.com/dularion/streama) - Self-hosted Netflix alternative. `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://github.com/ZoneMinder/ZoneMinder) - Closed-circuit television (CCTV) software application which supports IP, USB and Analog cameras. `GPL-2.0` `PHP` | ||||
| 
 | ||||
| ## Misc/Other | ||||
|  | @ -1331,6 +1332,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt | |||
| - `MIT` - [MIT License](http://opensource.org/licenses/MIT) | ||||
| - `MPL-1.1` - [Mozilla Public License Version 1.1](https://www.mozilla.org/media/MPL/1.1/index.txt) | ||||
| - `MPL-2.0` - [Mozilla Public License](https://www.mozilla.org/MPL/2.0/index.txt) | ||||
| - `Multiple` - Various different licenses, for different components of the project's software. | ||||
| - `OSL-3.0` - [Open Software License 3.0](https://opensource.org/licenses/osl-3.0.php) | ||||
| - `Other` - Non-standard license, usually unique to the project itself. | ||||
| - `Sendmail` - [Sendmail License](https://www.sendmail.com/pdfs/open_source/sendmail_license.pdf) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue