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

Merge branch 'srs.master'

This commit is contained in:
winlin 2014-11-14 11:41:13 +08:00
commit b90d32ee8b

View file

@ -27,7 +27,7 @@ for internet. SRS is simple for and only for problem domain is simplified.
SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP)/ SRS is a simple, [RTMP](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryRTMP)/
[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS), [HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS),
[high-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance), [high-performance(6k+ single process/thread)](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Performance),
single/multiple(plan) processes, edge/origin live server, single/multiple(plan) processes, edge/origin live server,
[x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm), [x86/x64/arm](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm),
compile depends on [st](http://sourceforge.net/projects/state-threads)(required), compile depends on [st](http://sourceforge.net/projects/state-threads)(required),