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

For #1615, fix build failed and srt api issue

Browse source
This commit is contained in:
winlin 2020-02-25 13:45:05 +08:00
parent 90afd06c85
commit 04d0620dde
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/core/srs_core_mem_watch.cpp
View file

@ -74,7 +74,7 @@ void srs_memory_report()
std::map<void*, SrsMemoryObject*>::iterator it;
for (it = _srs_ptrs.begin(); it != _srs_ptrs.end(); ++it) {
SrsMemoryObject* obj = it->second;
printf(" %s: %#"PRIx64", %dB\n", obj->category.c_str(), (int64_t)obj->ptr, obj->size);
printf(" %s: %#" PRIx64 ", %dB\n", obj->category.c_str(), (int64_t)obj->ptr, obj->size);
total += obj->size;
}

2
trunk/src/protocol/srs_protocol_utility.cpp
View file

@ -122,7 +122,7 @@ void srs_discovery_tc_url(string tcUrl, string& schema, string& host, string& vh
srs_vhost_resolve(vhost, stream, param);
// Ignore when the param only contains the default vhost.
if (param == "?vhost="SRS_CONSTS_RTMP_DEFAULT_VHOST) {
if (param == "?vhost=" SRS_CONSTS_RTMP_DEFAULT_VHOST) {
param = "";
}
}

4
trunk/src/srt/srt_server.cpp
View file

@ -256,7 +256,11 @@ void srt_server::on_work()
}
}
}
// @see 2020-01-28 https://github.com/Haivision/srt/commit/b8c70ec801a56bea151ecce9c09c4ebb720c2f68#diff-fb66028e8746fea578788532533a296bR786
#if SRT_VERSION_MAJOR > 1 || SRT_VERSION_MINOR > 4 || SRT_VERSION_PATCH > 1
srt_epoll_clear_usocks(_pollid);
#endif
}
SrtServerAdapter::SrtServerAdapter()