diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index e3829ba90..039b9e57d 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -69,7 +69,7 @@ SRS_LOG_LEVEL_V2=YES # Experts options. SRS_USE_SYS_SSL=NO # Use system ssl(-lssl) if required. SRS_VALGRIND=NO -SRS_SANITIZER=NO +SRS_SANITIZER=RESERVED SRS_SANITIZER_STATIC=NO SRS_SANITIZER_LOG=NO SRS_BUILD_TAG= # Set the object files tag name. @@ -518,7 +518,7 @@ function apply_auto_options() { # Enable asan, but disable for Centos # @see https://github.com/ossrs/srs/issues/3347 - if [[ $SRS_SANITIZER == NO && $OS_IS_CENTOS != YES ]]; then + if [[ $SRS_SANITIZER == RESERVED && $OS_IS_CENTOS != YES ]]; then echo "Enable asan by auto options." SRS_SANITIZER=YES fi @@ -591,6 +591,8 @@ function apply_detail_options() { if [[ $SRS_HTTP_API == NO ]]; then SRS_HTTP_API=YES; echo -e "${YELLOW}[WARN] Always enable HTTP API.${BLACK}"; fi if [[ $SRS_HLS == NO ]]; then SRS_HLS=YES; echo -e "${YELLOW}[WARN] Always enable HLS.${BLACK}"; fi if [[ $SRS_DVR == NO ]]; then SRS_DVR=YES; echo -e "${YELLOW}[WARN] Always enable DVR.${BLACK}"; fi + + if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER == NO; fi } apply_detail_options diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 48bea3f87..a6bab0507 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,7 +7,7 @@ The changelog for SRS. ## SRS 5.0 Changelog - +* v5.0, 2023-07-26, Merge [#3699](https://github.com/ossrs/srs/pull/3699): Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable.. v5.0.168 (#3699) * v5.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v5.0.168 (#3695) * v5.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v5.0.167 (#3515) * v5.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v5.0.166 (#3615) @@ -168,7 +168,6 @@ The changelog for SRS. ## SRS 4.0 Changelog - * v4.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v4.0.270 (#3695) * v4.0, 2022-12-24, For [#296](https://github.com/ossrs/srs/issues/296): MP3: Fix bug for TS or HLS with mp3 codec. v4.0.269 * v4.0, 2022-11-22, Pick [#3079](https://github.com/ossrs/srs/issues/3079): WebRTC: Fix no audio and video issue for Firefox. v4.0.268 @@ -411,7 +410,6 @@ The changelog for SRS. ## SRS 3.0 Changelog - * v3.0, 2021-05-12, Fix [#2311](https://github.com/ossrs/srs/issues/2311), Copy the request for stat client. 3.0.162 * v3.0, 2021-04-28, [3.0 release5(3.0.161)](https://github.com/ossrs/srs/releases/tag/v3.0-r5) released. 122750 lines. * v3.0, 2021-04-28, Upgrade players. 3.0.161 @@ -616,7 +614,6 @@ The changelog for SRS. ## SRS 2.0 Changelog - * v2.0, 2020-01-25, [2.0 release8(2.0.272)](https://github.com/ossrs/srs/releases/tag/v2.0-r8) released. 87292 lines. * v2.0, 2020-01-08, Merge [#1554](https://github.com/ossrs/srs/issues/1554), support logrotate copytruncate. 2.0.272 * v2.0, 2020-01-05, Merge [#1551](https://github.com/ossrs/srs/issues/1551), fix memory leak in RTSP stack. 2.0.270 diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp index bbf2a40b7..d1d14bfce 100644 --- a/trunk/src/app/srs_app_threads.cpp +++ b/trunk/src/app/srs_app_threads.cpp @@ -64,16 +64,11 @@ extern SrsStageManager* _srs_stages; extern SrsRtcBlackhole* _srs_blackhole; extern SrsResourceManager* _srs_rtc_manager; -extern SrsResourceManager* _srs_rtc_manager; extern SrsDtlsCertificate* _srs_rtc_dtls_certificate; #endif #include -extern SrsPps* _srs_pps_snack2; -extern SrsPps* _srs_pps_snack3; -extern SrsPps* _srs_pps_snack4; - SrsPps* _srs_pps_aloss2 = NULL; extern SrsPps* _srs_pps_ids; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 9aaa0ded8..03fbdf3f8 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -29,7 +29,7 @@ #define RTMP_SIG_SRS_DOMAIN "ossrs.net" // The current stable release. -#define VERSION_STABLE 4 +#define VERSION_STABLE 5 #define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE) ".0release" // For platform specified headers and defines. diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 908552475..8e8863f5a 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 168 +#define VERSION_REVISION 169 #endif