Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input_buffer.cpp
#	src/input/input_buffer.h

src/input/input_buffer.cpp

@@ -167,6 +167,15 @@ 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.init.size()){
+        if (!initData.count(it->first) || initData[it->first] != it->second.init){
+          initData[it->first] = it->second.init;
+        }
+      }else{
+        if (initData.count(it->first)){
+          it->second.init = initData[it->first];
+        }
+      }
       if (it->second.firstms < firstms){
         firstms = it->second.firstms;
       }

src/input/input_buffer.h

@@ -44,6 +44,8 @@ namespace Mist {
       DTSC::Meta recMeta;/*LTS*/
       std::ofstream recFile;/*LTS*/
       long long int recBpos;/*LTS*/
+       //This is used for an ugly fix to prevent metadata from dissapearing in some cases.
+      std::map<unsigned long, std::string> initData;
   };
 }