胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
cafe886c 2 parents 18eb8c81 34d1ce99

merge srs2

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -11,6 +11,7 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN]. @@ -11,6 +11,7 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN].
11 11
12 [![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)][donation1] 12 [![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)][donation1]
13 [![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)][donation2] 13 [![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)][donation2]
  14 +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
14 15
15 ## Content 16 ## Content
16 17
@@ -35,7 +36,6 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN]. @@ -35,7 +36,6 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN].
35 * [Modularity Architecture](#modularity-architecture) 36 * [Modularity Architecture](#modularity-architecture)
36 * [Stream Architecture](#stream-architecture) 37 * [Stream Architecture](#stream-architecture)
37 38
38 -  
39 ## About 39 ## About
40 40
41 SRS(Simple RTMP Server) over state-threads created in 2013.10. 41 SRS(Simple RTMP Server) over state-threads created in 2013.10.