external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Typo: line 263 - srs_app_srt_conn.cpp. v6.0.106 (#3854)

Browse source 
regards,
laur
---------

Co-authored-by: john <hondaxiao@tencent.com>
Co-authored-by: Haibo Chen <495810242@qq.com>
This commit is contained in:
Laurentiu 2023-12-15 17:13:16 +02:00 • committed by GitHub
parent 15601b4b2a
commit 2f95f2ae6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v6-changes"></a> <a name="v6-changes"></a>
## SRS 6.0 Changelog ## SRS 6.0 Changelog
* v6.0, 2023-12-15, Merge [#3854](https://github.com/ossrs/srs/pull/3854): Typo: line 263 - srs_app_srt_conn.cpp. v6.0.106 (#3854)
* v6.0, 2023-12-14, Merge [#3910](https://github.com/ossrs/srs/pull/3910): RTC: Support OPUS stereo SDP option. v6.0.105 (#3910) * v6.0, 2023-12-14, Merge [#3910](https://github.com/ossrs/srs/pull/3910): RTC: Support OPUS stereo SDP option. v6.0.105 (#3910)
* v6.0, 2023-12-14, Merge [#3902](https://github.com/ossrs/srs/pull/3902): Security: Support IP whitelist for HTTP-FLV, HLS, WebRTC, and SRT. v6.0.104 (#3902) * v6.0, 2023-12-14, Merge [#3902](https://github.com/ossrs/srs/pull/3902): Security: Support IP whitelist for HTTP-FLV, HLS, WebRTC, and SRT. v6.0.104 (#3902)
* v6.0, 2023-11-22, Merge [#3891](https://github.com/ossrs/srs/pull/3891): fix 'sed' error in options.sh. v6.0.103 (#3891) * v6.0, 2023-11-22, Merge [#3891](https://github.com/ossrs/srs/pull/3891): fix 'sed' error in options.sh. v6.0.103 (#3891)

2
trunk/src/app/srs_app_server.cpp
View file

@ -592,7 +592,7 @@ srs_error_t SrsServer::listen()
// Create HTTPS API listener. // Create HTTPS API listener.
if (_srs_config->get_https_api_enabled()) { if (_srs_config->get_https_api_enabled()) {
if (reuse_api_over_server_) { if (reuse_api_over_server_) {
srs_trace("HTTPS-API: Reuse listen to http server %s", _srs_config->get_http_stream_listen().c_str()); srs_trace("HTTPS-API: Reuse listen to http server %s", _srs_config->get_https_stream_listen().c_str());
} else { } else {
apis_listener_->set_endpoint(_srs_config->get_https_api_listen())->set_label("HTTPS-API"); apis_listener_->set_endpoint(_srs_config->get_https_api_listen())->set_label("HTTPS-API");
if ((err = apis_listener_->listen()) != srs_success) { if ((err = apis_listener_->listen()) != srs_success) {

2
trunk/src/app/srs_app_srt_conn.cpp
View file

@ -263,7 +263,7 @@ srs_error_t SrsMpegtsSrtConn::do_cycle()
// If streamid empty, using default streamid instead. // If streamid empty, using default streamid instead.
if (streamid.empty()) { if (streamid.empty()) {
streamid = "#!::r=live/livestream,m=publish"; streamid = "#!::r=live/livestream,m=publish";
srs_warn("srt get empty streamid, using default steramid %s instead", streamid.c_str()); srs_warn("srt get empty streamid, using default streamid %s instead", streamid.c_str());
} }
// Detect streamid of srt to request. // Detect streamid of srt to request.

2
trunk/src/core/srs_core_version6.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 6 #define VERSION_MAJOR 6
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 105 #define VERSION_REVISION 106
#endif #endif