Merge branch 'openSourceMulti' into proMulti

This commit is contained in:
Thulinma 2015-04-06 20:26:08 +02:00
commit f48cdb14a1

View file

@ -32,7 +32,7 @@ namespace Mist {
retVal += *keyIt; retVal += *keyIt;
} }
} }
return retVal * (1 + (double)selectedTracks.size() * 0.1); return retVal * 1.1;
} }
std::string OutProgressiveMP4::DTSCMeta2MP4Header(long long & size){ std::string OutProgressiveMP4::DTSCMeta2MP4Header(long long & size){