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

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
monktan
2020-09-21 15:50:15 +08:00
parent 0b33bc1888 416d21df36
commit d3be28b1a9
13 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/WebHook.cpp
View File

@@ -168,7 +168,7 @@ static ArgsType make_json(const MediaInfo &args){
body["app"] = args._app;
body["stream"] = args._streamid;
body["params"] = args._param_strs;
return std::move(body);
return body;
}
static void reportServerStarted(){