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
This commit is contained in:
Thulinma 2016-06-26 21:16:06 +02:00
commit 02ac648bae
4 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/dtsc.h
View file

@ -313,6 +313,7 @@ namespace DTSC {
void reset();
void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
void finalize();
uint32_t biggestFragment();
std::string getIdentifier();
std::string getWritableIdentifier();