winlin

Merge branch 'srs.master'

正在显示 1 个修改的文件 包含 5 行增加4 行删除
1 #Simple-RTMP-Server 1 #Simple-RTMP-Server
2 2
3 SRS is industrial-strength live streaming cluster, 3 SRS is industrial-strength live streaming cluster,
4 -for the best conceptual integrity and the simplest implementation,  
5 -which delivering rtmp/hls/http live on x86/x64/arm/mips linux, 4 +for the best conceptual integrity and the simplest implementation.
  5 +
  6 +SRS delivers rtmp/hls live on x86/x64/arm/mips linux,
6 supports origin/edge/vhost and transcode/ingest and dvr/forward 7 supports origin/edge/vhost and transcode/ingest and dvr/forward
7 -and http-api/http-callback/reload and srs-librtmp, with wiki and  
8 -the most simple architecture. 8 +and http-api/http-callback/reload, exports srs-librtmp,
  9 +with EN/CN wiki and the most simple architecture.
9 10
10 Download from github.io: 11 Download from github.io:
11 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.0.zip) 12 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.0.zip)