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:
#	lib/mp4.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_generic.h
This commit is contained in:
Thulinma 2015-09-03 22:03:24 +02:00
commit f562369db2
9 changed files with 238 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/dtsc.h
View file

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