Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-18 06:02:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
monktan
2020-11-24 14:49:21 +08:00
parent 6e8d19704e f7433b0f90
commit 8e575c0c78
11 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/WebApi.cpp
View File

@@ -1309,8 +1309,6 @@ void installWebApi() {
}
void unInstallWebApi(){
RtpSelector::Instance().clear();
{
lock_guard<recursive_mutex> lck(s_proxyMapMtx);
s_proxyMap.clear();
@@ -1323,6 +1321,7 @@ void unInstallWebApi(){
{
#if defined(ENABLE_RTPPROXY)
RtpSelector::Instance().clear();
lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);
s_rtpServerMap.clear();
#endif