Merge remote-tracking branch 'origin/master' into zqsong

README.md

@@ -13,6 +13,7 @@
 - Well performance and stable test,can be used commercially.
 - Well performance and stable test,can be used commercially.
 - Support linux, macos, ios, android, Windows Platforms.
 - Support linux, macos, ios, android, Windows Platforms.
 - Very low latency(lower then one second), video opened immediately.
 - Very low latency(lower then one second), video opened immediately.
+- **Now Support websocket-flv!**
 
 
 ## Features
 ## Features
 
 

README_CN.md

@@ -11,6 +11,7 @@
 - 代码经过大量的稳定性、性能测试，可满足商用服务器项目。
 - 代码经过大量的稳定性、性能测试，可满足商用服务器项目。
 - 支持linux、macos、ios、android、windows平台
 - 支持linux、macos、ios、android、windows平台
 - 支持画面秒开(GOP缓存)、极低延时(1秒内)
 - 支持画面秒开(GOP缓存)、极低延时(1秒内)
+- **支持websocket-flv直播**
 - [ZLMediaKit高并发实现原理](https://github.com/xiongziliang/ZLMediaKit/wiki/ZLMediaKit%E9%AB%98%E5%B9%B6%E5%8F%91%E5%AE%9E%E7%8E%B0%E5%8E%9F%E7%90%86)
 - [ZLMediaKit高并发实现原理](https://github.com/xiongziliang/ZLMediaKit/wiki/ZLMediaKit%E9%AB%98%E5%B9%B6%E5%8F%91%E5%AE%9E%E7%8E%B0%E5%8E%9F%E7%90%86)
 
 
 ## 项目定位
 ## 项目定位