hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Oswald_MP4_EDITS' of github.com:DDVTECH/libmist into Oswald_MP4_EDITS

Browse source 
Conflicts:
	lib/mp4.cpp

No idea what happened
This commit is contained in:
Oswald de Bruin 2013-06-26 16:13:14 +02:00 • committed by Erik Zandvliet
parent ae6270faff
commit c8782b4d24
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mp4.cpp
View file

@ -2863,7 +2863,7 @@ namespace MP4 {
setMatrix(0,7);*/ setMatrix(0,7);*/
//fills automatically with zero's //fills automatically with zero's
setMatrix(0x40000000,8); setMatrix(0x40000000,8);
setTrackID(0); setTrackID(1);
} }
void MVHD::setCreationTime(uint64_t newCreationTime){ void MVHD::setCreationTime(uint64_t newCreationTime){