From d98a85b3687a492bfc94d87c6e82fa534a106625 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 31 Oct 2020 22:16:46 +0800 Subject: [PATCH 1/2] Release 3.0-r2, 3.0.153 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4f112dc01..c799c962a 100755 --- a/README.md +++ b/README.md @@ -145,6 +145,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-31, [3.0 release2(3.0.153)][r3.0r2] released. 122663 lines. * v3.0, 2020-10-31, Fix [#509][bug #509], Always malloc stack on heap. 3.0.153 * v3.0, 2020-10-31, Remove some global elements for debugging. 3.0.152 * v3.0, 2020-10-31, Use global _srs_server for debugging. 3.0.151 @@ -773,6 +774,7 @@ For previous versions, please read: ## Releases +* 2020-10-31, [Release v3.0-r2][r3.0r2], 3.0 release2, 3.0.153, 122663 lines. * 2020-10-10, [Release v3.0-r1][r3.0r1], 3.0 release1, 3.0.144, 122674 lines. * 2020-06-27, [Release v3.0-r0][r3.0r0], 3.0 release0, 3.0.141, 122674 lines. * 2020-03-29, [Release v3.0-b3][r3.0b4], 3.0 beta4, 3.0.139, 122674 lines. @@ -1709,6 +1711,7 @@ Winlin [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r3.0r2]: https://github.com/ossrs/srs/releases/tag/v3.0-r2 [r3.0r1]: https://github.com/ossrs/srs/releases/tag/v3.0-r1 [r3.0r0]: https://github.com/ossrs/srs/releases/tag/v3.0-r0 [r3.0b4]: https://github.com/ossrs/srs/releases/tag/v3.0-b4 From 6e922b9589dbfe216ca11bc783ea919bdb1a27a9 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 10 Nov 2020 10:19:43 +0800 Subject: [PATCH 2/2] Refine README for SRS3 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c799c962a..a2e8c6cc5 100755 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![](https://codecov.io/gh/ossrs/srs/branch/3.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/3.0release) [![](https://cloud.githubusercontent.com/assets/2777660/22814959/c51cbe72-ef92-11e6-81cc-32b657b285d5.png)](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat) -SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/WebRTC/SRT/GB28181，高效、稳定、易用，简单而快乐。
-SRS is a RTMP/HLS/WebRTC/SRT/GB28181 streaming cluster, high efficiency, stable and simple. +SRS/3.0，[OuXuli][release3]，是一个流媒体集群，支持RTMP/HLS/FLV，高效、稳定、易用，简单而快乐。
+SRS is a RTMP/HLS/FLV streaming cluster, high efficiency, stable and simple. > Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].