From db3e11152e890a597cb5c878f3d2d0452125d34e Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 1 Jul 2021 06:30:24 +0800 Subject: [PATCH] Move AUTHORS.txt to trunk for docker. 5.0.7 --- CHANGELOG.md | 4 +++- PERFORMANCE.md | 2 +- README.md | 2 +- trunk/src/core/srs_core.hpp | 2 +- trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/core/srs_core_version5.hpp | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe7bf4889..105c0361a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2021-07-01, Move AUTHORS.txt to trunk for docker. 5.0.7 * v5.0, 2021-06-28, Squash: Support query lastest available version. 5.0.6 * v5.0, 2021-06-22, Squash: Support ARM platform. 5.0.5 * v5.0, 2021-06-16, Change [GB28181](https://github.com/ossrs/srs/issues/1500) to [feature/gb28181](https://github.com/ossrs/srs/tree/feature/gb28181). 5.0.4 @@ -18,6 +19,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-07-01, Merge [#2452](https://github.com/ossrs/srs/pull/2452), fix FFmpeg bug by updating channel_layout. 4.0.138 * v4.0, 2021-06-30, Merge [#2440](https://github.com/ossrs/srs/pull/2440), fix [#2390](https://github.com/ossrs/srs/issues/2390), SRT bug for zerolatency. 4.0.137 * v4.0, 2021-06-28, Merge [#2435](https://github.com/ossrs/srs/pull/2435), fix bug for HTTP-RAW-API to check vhost. 4.0.136 * v4.0, 2021-06-28, Fix [#2431](https://github.com/ossrs/srs/issues/2431), configure FFmpeg bug. 4.0.135 @@ -806,7 +808,7 @@ Winlin 2021 [pr #558]: https://github.com/ossrs/srs/pull/558 [pr #559]: https://github.com/ossrs/srs/pull/559 -[authors]: https://github.com/ossrs/srs/blob/4.0release/trunk/AUTHORS.txt +[authors]: https://github.com/ossrs/srs/blob/develop/trunk/AUTHORS.txt [bigthanks]: https://github.com/ossrs/srs/wiki/v4_CN_Product#bigthanks [st]: https://github.com/winlinvip/state-threads [st2]: https://github.com/ossrs/state-threads/tree/srs diff --git a/PERFORMANCE.md b/PERFORMANCE.md index ad4749ab7..b534f916a 100644 --- a/PERFORMANCE.md +++ b/PERFORMANCE.md @@ -143,7 +143,7 @@ Winlin 2021 [p22]: https://github.com/ossrs/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa [p23]: https://github.com/ossrs/srs/pull/239 -[authors]: https://github.com/ossrs/srs/blob/4.0release/trunk/AUTHORS.txt +[authors]: https://github.com/ossrs/srs/blob/develop/trunk/AUTHORS.txt [bigthanks]: https://github.com/ossrs/srs/wiki/Product#release40 [st]: https://github.com/ossrs/state-threads [st2]: https://github.com/ossrs/state-threads/tree/srs diff --git a/README.md b/README.md index 8eab592eb..02f75ecae 100755 --- a/README.md +++ b/README.md @@ -379,7 +379,7 @@ Supported operating systems and hardware: Beijing, 2013.10
Winlin -[authors]: https://github.com/ossrs/srs/blob/4.0release/trunk/AUTHORS.txt +[authors]: https://github.com/ossrs/srs/blob/develop/trunk/AUTHORS.txt [bigthanks]: https://github.com/ossrs/srs/wiki/Product#release40 [st]: https://github.com/ossrs/state-threads [st2]: https://github.com/ossrs/state-threads/tree/srs diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index f8c60d9bd..1c89e04d1 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -23,7 +23,7 @@ #define RTMP_SIG_SRS_CODE "Leo" #define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs" #define RTMP_SIG_SRS_LICENSE "MIT" -#define RTMP_SIG_SRS_AUTHORS "https://github.com/ossrs/srs/blob/4.0release/trunk/AUTHORS.txt" +#define RTMP_SIG_SRS_AUTHORS "https://github.com/ossrs/srs/blob/develop/trunk/AUTHORS.txt" #define RTMP_SIG_SRS_VERSION SRS_XSTR(VERSION_MAJOR) "." SRS_XSTR(VERSION_MINOR) "." SRS_XSTR(VERSION_REVISION) #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY "/" RTMP_SIG_SRS_VERSION "(" RTMP_SIG_SRS_CODE ")" #define RTMP_SIG_SRS_DOMAIN "ossrs.net" diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index df8223768..c30d735f1 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 137 +#define VERSION_REVISION 138 #endif diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 54c0399f8..01cb28ae9 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 6 +#define VERSION_REVISION 7 #endif