Merge branch 'development' into LTS_development
# Conflicts: # src/input/input_buffer.cpp
This commit is contained in:
commit
8eb518606a
5 changed files with 15 additions and 19 deletions
|
@ -167,6 +167,7 @@ namespace Mist {
|
|||
long long unsigned int firstms = 0xFFFFFFFFFFFFFFFFull;
|
||||
long long unsigned int lastms = 0;
|
||||
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
|
||||
if (it->second.type == "meta" || !it->second.type.size()){continue;}
|
||||
if (it->second.init.size()){
|
||||
if (!initData.count(it->first) || initData[it->first] != it->second.init){
|
||||
initData[it->first] = it->second.init;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue