From df8c0280547d3ba85546b14a5b86f58992b95e22 Mon Sep 17 00:00:00 2001 From: terrencetang2023 Date: Tue, 22 Aug 2023 09:38:21 +0800 Subject: [PATCH] Bugfix: Log format output type does not match. v5.0.171 (#3775) A segmentation fault occurred on arm https://github.com/ossrs/srs/issues/3714 --------- Co-authored-by: Haibo Chen <495810242@qq.com> --- trunk/doc/CHANGELOG.md | 3 ++- trunk/src/app/srs_app_hls.cpp | 2 +- trunk/src/core/srs_core_version5.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 64735366d..5408d7b65 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,8 +7,9 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-08-22, Merge [#3775](https://github.com/ossrs/srs/pull/3775): Bugfix: Log format output type does not match. v5.0.171 (#3699) * v5.0, 2023-08-02, HLS: Ignore empty NALU to avoid error. v5.0.170 -* 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-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) diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 49f6ccf83..95c2b09b8 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -1383,7 +1383,7 @@ void SrsHls::hls_show_mux_log() // the run time is not equals to stream time, // @see: https://github.com/ossrs/srs/issues/81#issuecomment-48100994 // it's ok. - srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%dms, sno=%d, ts=%s, dur=%dms, dva=%dp", + srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%" PRId64 "ms, sno=%d, ts=%s, dur=%dms, dva=%dp", pprint->age(), controller->sequence_no(), controller->ts_url().c_str(), srsu2msi(controller->duration()), controller->deviation()); } diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 2e3cd7915..a56accabf 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 170 +#define VERSION_REVISION 171 #endif