From 408c2d05edada3497b14e8fb779ae120b53ac7d1 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 Feb 2019 20:22:49 +0800 Subject: [PATCH 1/2] CI: Update badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e96d34151..5b99068f4 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Simple-RTMP-Server -[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/2.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/2.0release) +[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/master.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/master) [![Wechat](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) [Skype](https://github.com/ossrs/srs/wiki/v1_EN_Contact#skype-or-gitter) From eeffb6d3ff92907da7f3f546e3d824e462eab3a7 Mon Sep 17 00:00:00 2001 From: Keegan H Date: Thu, 7 Feb 2019 07:01:14 -0600 Subject: [PATCH 2/2] Update README.md (#1317) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5b99068f4..bc957e25c 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ SRS/2.0, [ZhouGuowen][release2] SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
-SRS is industrial-strength live streaming cluster, for the best conceptual integrity and the simplest implementation. +SRS is an industrial-strength live streaming cluster, with the best conceptual integrity and the simplest implementation. Download from github.io: [Centos6-x86_64][centos0], [more...][more0]
Download from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]
@@ -15,9 +15,9 @@ Website for SRS/2.0, read SRS 2.0 [Chinese][srs_CN] or [English][srs_EN]. ## Why SRS? -1. Completely rewrite HLS following m3u8/ts spec, and HLS support h.264+aac/mp3. -1. High efficient RTMP deliverying support 7k+ concurrency, vhost based, both origin and edge. -1. Embeded simplified media HTTP server for HLS, api and HTTP flv/ts/mp3/aac streaming. +1. We completely rewrote HLS following m3u8/ts spec, and HLS support h.264+aac/mp3. +1. Highly efficient RTMP streaming, supporting 7k+ clients concurrency, vhost based, both origin and edge. +1. Embedded simplified media HTTP server for HLS, api and HTTP flv/ts/mp3/aac streaming. 1. Variety input: RTMP, pull by ingest file or stream(HTTP/RTMP/RTSP), push by stream caster RTSP/MPEGTS-over-UDP. 1. Popular internet delivery: RTMP/HDS for flash, HLS for mobile(IOS/IPad/MAC/Android), HTTP @@ -38,7 +38,7 @@ Enjoy it! ## About -SRS(Simple RTMP Server) over state-threads created in 2013.10. +SRS(Simple RTMP Server) over state-threads created on 2013.10. SRS delivers rtmp/hls/http/hds live on x86/x64/arm/mips linux/osx, supports origin/edge/vhost and transcode/ingest and dvr/forward