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.h
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2017-02-28 14:07:18 +01:00
commit daa0833970
6 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/input/input.cpp
View file

@ -173,10 +173,6 @@ namespace Mist {
return 0;
}
if (streamName != "") {
config->getOption("streamname") = streamName;
}
streamName = config->getString("streamname");
nProxy.streamName = streamName;
if (!setup()) {
@ -189,6 +185,7 @@ namespace Mist {
std::cerr << "Reading header for " << config->getString("input") << " failed." << std::endl;
return 0;
}
myMeta.sourceURI = config->getString("input");
parseHeader();
MEDIUM_MSG("Header parsed, %lu tracks", myMeta.tracks.size());
@ -357,7 +354,7 @@ namespace Mist {
pullLock.unlink();
return;
}
if (!Util::startInput(streamName, "push://")) {//manually override stream url to start the buffer
if (!Util::startInput(streamName, "push://INTERNAL_ONLY:"+config->getString("input"))) {//manually override stream url to start the buffer
pullLock.post();
pullLock.close();
pullLock.unlink();