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/input/input.cpp
This commit is contained in:
Thulinma 2016-07-06 11:18:18 +02:00
commit 7b0d3a9365
6 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/input.cpp
View file

@ -138,12 +138,16 @@ namespace Mist {
return 0;
}
parseHeader();
MEDIUM_MSG("Header parsed, %lu tracks", myMeta.tracks.size());
if (!streamName.size()) {
MEDIUM_MSG("Starting convert");
convert();
} else if (!needsLock()) {
MEDIUM_MSG("Starting stream");
stream();
}else{
MEDIUM_MSG("Starting serve");
serve();
}
return 0;