winlin

Merge branch 'srs.master'

正在显示 1 个修改的文件 包含 12 行增加3 行删除
@@ -25,9 +25,18 @@ SRS focus on small problem domain, which is the most complex for all software(se @@ -25,9 +25,18 @@ SRS focus on small problem domain, which is the most complex for all software(se
25 Because of lack of deveoper resource, SRS only provides features which is the most popular 25 Because of lack of deveoper resource, SRS only provides features which is the most popular
26 for internet. SRS is simple for and only for problem domain is simplified. 26 for internet. SRS is simple for and only for problem domain is simplified.
27 27
28 -SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP)/  
29 -[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS),  
30 -[high-performance(6k+ clients)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), 28 +SRS is a simple, RTMP(
  29 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP),
  30 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryRTMP)
  31 +)/
  32 +HLS(
  33 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS),
  34 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DeliveryHLS)
  35 +),
  36 +high-performance(6k+ clients)(
  37 +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance),
  38 +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_Performance)
  39 +),
31 single/multiple(plan) processes, edge/origin live server, 40 single/multiple(plan) processes, edge/origin live server,
32 [x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm), 41 [x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm),
33 compile depends on [st](http://sourceforge.net/projects/state-threads)(required), 42 compile depends on [st](http://sourceforge.net/projects/state-threads)(required),