胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
c69e84b8 2 parents b200e9f9 f9a7d403

Merge branch 'srs.master'

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 2 行删除
@@ -5,8 +5,9 @@ for the best conceptual integrity and the simplest implementation. @@ -5,8 +5,9 @@ for the best conceptual integrity and the simplest implementation.
5 5
6 SRS delivers rtmp/hls live on x86/x64/arm/mips linux, 6 SRS delivers rtmp/hls live on x86/x64/arm/mips linux,
7 supports origin/edge/vhost and transcode/ingest and dvr/forward 7 supports origin/edge/vhost and transcode/ingest and dvr/forward
8 -and http-api/http-callback/reload, exports srs-librtmp,  
9 -with EN/CN wiki and the most simple architecture. 8 +and http-api/http-callback/reload, introduces tracable
  9 +session-oriented log, exports client srs-librtmp,
  10 +provides EN/CN wiki and the most simple architecture.
10 11
11 Download from github.io: 12 Download from github.io:
12 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.0.zip) 13 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-1.0.0.zip)