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
This commit is contained in:
Thulinma 2017-07-28 18:39:49 +02:00
commit dc8bae8dd3
10 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/output/output.cpp
View file

@ -46,7 +46,7 @@ namespace Mist{
cfg->addOption("noinput", option);
}
void Output::bufferLivePacket(DTSC::Packet & packet){
void Output::bufferLivePacket(const DTSC::Packet & packet){
if (!pushIsOngoing){
waitForStreamPushReady();
}