Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiongziliang 2020-02-29 10:28:20 +08:00
commit 6cc56a758a

View File

@ -363,9 +363,7 @@ docker build -t zlmediakit .
- [IOS摄像头实时录制,生成rtsp/rtmp/hls/http-flv](https://gitee.com/xiahcu/IOSMedia)
- [IOS rtmp/rtsp播放器视频推流器](https://gitee.com/xiahcu/IOSPlayer)
- [支持linux、windows、mac的rtmp/rtsp播放器](https://github.com/xiongziliang/ZLMediaPlayer)
上述工程可能在最新的代码的情况下编译不过,请手动修改
- [配套的管理WEB网站](https://github.com/chenxiaolei/ZLMediaKit_NVR_UI)
## 授权协议