1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

merge srs2

This commit is contained in:
winlin 2015-11-27 17:46:00 +08:00
commit cafe886c3f

View file

@ -11,6 +11,7 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN].
[![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)][donation1]
[![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)][donation2]
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
## Content
@ -35,7 +36,6 @@ Website for SRS/3.0, read SRS 3.0 [Chinese][srs_CN] or [English][srs_EN].
* [Modularity Architecture](#modularity-architecture)
* [Stream Architecture](#stream-architecture)
## About
SRS(Simple RTMP Server) over state-threads created in 2013.10.