Merge branch '4.0release' into develop

3 years ago · 61f1531aa3
parent 70aa6b66bb ab81696102
commit 61f1531aa3
2 changed files with 2 additions and 1 deletions
--- a/trunk/doc/CHANGELOG.md
+++ b/trunk/doc/CHANGELOG.md
@ -36,6 +36,7 @@ The changelog for SRS.

 ## SRS 4.0 Changelog

+* v4.0, 2022-03-15, Merge [#2966](https://github.com/ossrs/srs/pull/2966): Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
 * v4.0, 2022-03-07, RTC: Identify the WebRTC publisher in param for hooks. v4.0.247
 * v4.0, 2022-03-07, SRT: Append vhost to stream, not app. v4.0.246
 * v4.0, 2022-02-15, Fix warnings for uuid. v4.0.245
--- 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    247
+#define VERSION_REVISION    248

 #endif