Skip to content

Commit df8c028

Browse files
terrencetang2023duiniuluantanqin
authored andcommitted
Bugfix: Log format output type does not match. v5.0.171 (#3775)
A segmentation fault occurred on arm #3714 --------- Co-authored-by: Haibo Chen <[email protected]>
1 parent 94a5343 commit df8c028

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

trunk/doc/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ The changelog for SRS.
77
<a name="v5-changes"></a>
88

99
## SRS 5.0 Changelog
10+
* 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)
1011
* v5.0, 2023-08-02, HLS: Ignore empty NALU to avoid error. v5.0.170
11-
* 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)
12+
* 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)
1213
* 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)
1314
* 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)
1415
* v5.0, 2023-07-09, Merge [#3615](https://github.com/ossrs/srs/pull/3615): Compile: Fix typo for 3rdparty. v5.0.166 (#3615)

trunk/src/app/srs_app_hls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ void SrsHls::hls_show_mux_log()
13831383
// the run time is not equals to stream time,
13841384
// @see: https://github.com/ossrs/srs/issues/81#issuecomment-48100994
13851385
// it's ok.
1386-
srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%dms, sno=%d, ts=%s, dur=%dms, dva=%dp",
1386+
srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%" PRId64 "ms, sno=%d, ts=%s, dur=%dms, dva=%dp",
13871387
pprint->age(), controller->sequence_no(), controller->ts_url().c_str(),
13881388
srsu2msi(controller->duration()), controller->deviation());
13891389
}

trunk/src/core/srs_core_version5.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 5
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 170
12+
#define VERSION_REVISION 171
1313

1414
#endif

0 commit comments

Comments
 (0)