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_hls.cpp
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
This commit is contained in:
Thulinma 2016-07-21 12:03:40 +02:00
commit d86899f6cc
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_hls.cpp
View file

@ -152,7 +152,7 @@ namespace Mist {
lines.push_back(lineBuf);
}
unsigned int skippedLines = 0;
if (myMeta.live) {
if (myMeta.live && lines.size()) {
//only print the last segment when VoD
lines.pop_back();
/*LTS-START*/