Compare commits

..

No commits in common. "41bdfa0755d3c7eef6fffc2577b501226fde7cd2" and "dfca520857fdc67c431bf811c14d174b123a88a6" have entirely different histories.

4 changed files with 39 additions and 43 deletions

View File

@ -1,4 +1,4 @@
#include <atomic>
#include <atomic>
static int test()
{

View File

@ -1,5 +1,5 @@
#ifdef APSTUDIO_INVOKED
#error "This file is not editable by Visual C++."
#ifdef APSTUDIO_INVOKED
#error This file is not editable by Visual C++.
#endif //APSTUDIO_INVOKED
#include "winres.h"

View File

@ -1191,7 +1191,6 @@ void installWebApi() {
auto dst_url = allArgs["dst_url"];
auto retry_count = allArgs["retry_count"].empty() ? -1 : allArgs["retry_count"].as<int>();
EventPollerPool::Instance().getPoller(false)->async([=](){
addStreamPusherProxy(allArgs["schema"],
allArgs["vhost"],
allArgs["app"],
@ -1212,7 +1211,6 @@ void installWebApi() {
invoker(200, headerOut, val.toStyledString());
});
});
});
// 关闭推流代理 [AUTO-TRANSLATED:91602b75]
// Close the push stream proxy
@ -1260,7 +1258,6 @@ void installWebApi() {
vhost = allArgs["vhost"];
}
auto tuple = MediaTuple { vhost, allArgs["app"], allArgs["stream"], "" };
EventPollerPool::Instance().getPoller(false)->async([=]() {
addStreamProxy(tuple,
allArgs["url"],
retry_count,
@ -1278,7 +1275,6 @@ void installWebApi() {
invoker(200, headerOut, val.toStyledString());
});
});
});
// 关闭拉流代理 [AUTO-TRANSLATED:5204f128]
// Close the pull stream proxy

View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
*
* This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).