hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2016-07-21 00:01:47 +02:00
commit 1e3d4f6ee1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_rtmp.cpp
View file

@ -10,6 +10,7 @@
namespace Mist { namespace Mist {
OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn) { OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn) {
isPushing = false;
maxbps = config->getInteger("maxkbps")*128; maxbps = config->getInteger("maxkbps")*128;
if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){ if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){
streamName = config->getString("streamname"); streamName = config->getString("streamname");
@ -147,7 +148,6 @@ namespace Mist {
maxSkipAhead = 1500; maxSkipAhead = 1500;
minSkipAhead = 500; minSkipAhead = 500;
isPushing = false;
} }
bool OutRTMP::listenMode(){ bool OutRTMP::listenMode(){