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

5
lib/mp4_generic.cpp
View file

@ -58,9 +58,10 @@ namespace MP4 {
setBox(newContent, tempLoc);
}
Box & TRAF::getContent(uint32_t no) {
/// Gets a reference to the given box number. If unsafe, doesn't check boundaries (getContentCount check skipped).
Box & TRAF::getContent(uint32_t no, bool unsafe) {
static Box ret = Box((char *)"\000\000\000\010erro", false);
if (no > getContentCount()) {
if (!unsafe && no > getContentCount()) {
return ret;
}
unsigned int i = 0;