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_progressive_mp4.cpp
This commit is contained in:
Thulinma 2017-01-31 14:51:49 +01:00
commit ba5cbcb05f
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/mp4_generic.h
View file

@ -22,7 +22,7 @@ namespace MP4 {
TRAF();
uint32_t getContentCount();
void setContent(Box & newContent, uint32_t no);
Box & getContent(uint32_t no);
Box & getContent(uint32_t no, bool unsafe = false);
std::string toPrettyString(uint32_t indent = 0);
};
//TRAF Box