From 0ce2983e4422edd9d1567789ad8c8cb3593df704 Mon Sep 17 00:00:00 2001 From: Winlin Date: Tue, 13 Jun 2023 10:24:40 +0800 Subject: [PATCH] TOC: Welcome to the new TOC member, ZhangJunqin. (#3579) ------ Co-authored-by: ChenGH Co-authored-by: Haibo Chen <495810242@qq.com> Co-authored-by: LiPeng --- README.md | 1 + trunk/AUTHORS.md | 1 + trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version6.hpp | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 42201148e..468ffd365 100755 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ The [TOC(Technical Oversight Committee)](trunk/AUTHORS.md#toc) and [contributors * [LiPeng](https://github.com/lipeng19811218): Concentrates on WebRTC and contributes to memory management and smart pointers. * [ChenGuanghua](https://github.com/chen-guanghua): Focused on WebRTC/QoS and introduced the Asan toolchain to SRS. * [ChenHaibo](https://github.com/duiniuluantanqin): Specializes in GB28181 and HTTP API, contributing to patches for FFmpeg with WHIP. +* [ZhangJunqin](https://github.com/chundonglinlin): Focused on H.265, Prometheus Exporter, and API module. A big `THANK YOU` also goes to: diff --git a/trunk/AUTHORS.md b/trunk/AUTHORS.md index de186f8a3..29cf203c1 100644 --- a/trunk/AUTHORS.md +++ b/trunk/AUTHORS.md @@ -11,6 +11,7 @@ The TOC(Technical Oversight Committee): - `LiPeng` - `ChenGuanghua` - `ChenHaibo` +- `ZhangJunqin` ## CONTRIBUTORS diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 92deff039..9ae6ff166 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2023-06-13, Merge [#3579](https://github.com/ossrs/srs/pull/3579): TOC: Welcome to the new TOC member, ZhangJunqin. v6.0.50 (#3579) * v6.0, 2023-06-12, Merge [#3570](https://github.com/ossrs/srs/pull/3570): GB: Correct the range of keyframe error for compile warning. v6.0.49 (#3570) * v6.0, 2023-06-05, Fix command injection in demonstration api-server for HTTP callback. v6.0.48 * v6.0, 2023-06-05, Merge [#3565](https://github.com/ossrs/srs/pull/3565): DTLS: Use bio callback to get fragment packet. v6.0.47 (#3565) diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 0ca80c5d7..5b93a8a71 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 49 +#define VERSION_REVISION 50 #endif