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

5
lib/mp4.cpp
View file

@ -409,6 +409,10 @@ namespace MP4 {
case 0x75756964:
return ((UUID *)this)->toPrettyString(indent);
break;
case 0x70617370:
return ((PASP*)this)->toPrettyString(indent);
break;
/*LTS-START*/
case 0x73696478:
return ((SIDX*)this)->toPrettyString(indent);
break;
@ -418,7 +422,6 @@ namespace MP4 {
case 0x696F6473:
return ((IODS*)this)->toPrettyString(indent);
break;
/*LTS-START*/
case 0x73696E66:
return ((SINF *)this)->toPrettyString(indent);
break;