Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2019-04-29 11:05:43 +02:00
commit 69d2ca21d3
5 changed files with 48 additions and 5 deletions

View file

@ -108,6 +108,7 @@ namespace Mist{
/// Calculates the size of a Cluster (contents only) and returns it.
/// Bases the calculation on the currently selected tracks and the given start/end time for the cluster.
uint32_t OutEBML::clusterSize(uint64_t start, uint64_t end){
if (start == end){++end;}
uint32_t sendLen = EBML::sizeElemUInt(EBML::EID_TIMECODE, start);
for (std::set<long unsigned int>::iterator it = selectedTracks.begin();
it != selectedTracks.end(); it++){