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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-09-05 20:40:54 +02:00
commit b400ae20c0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/input/input_buffer.cpp
View file

@ -80,7 +80,7 @@ namespace Mist {
capa["codecs"][0u][2u].append("*");
isBuffer = true;
singleton = this;
bufferTime = 0;
bufferTime = 50000;
cutTime = 0;
segmentSize = 5000;
}
@ -685,6 +685,7 @@ namespace Mist {
tmpNum = config->getOption("bufferTime").asInt();
}
}
if (tmpNum < 1000){tmpNum = 1000;}
//if the new value is different, print a message and apply it
if (bufferTime != tmpNum){
DEBUG_MSG(DLVL_DEVEL, "Setting bufferTime from %u to new value of %lli", bufferTime, tmpNum);