Merge branch 'development' into LTS_development

2016-10-11 15:04:11 +02:00 · 2016-10-11 15:04:11 +02:00 · 915a10207b
commit 915a10207b
parent 46703ad50d f22d95b974
6 changed files with 70 additions and 10 deletions
--- a/lib/dtsc.h
+++ b/lib/dtsc.h
@ -353,6 +353,8 @@ namespace DTSC {
      void toPrettyString(std::ostream & str, int indent = 0, int verbosity = 0);
      //members:
      std::map<unsigned int, Track> tracks;
+      Track & mainTrack();
+      uint32_t biggestFragment();
      bool vod;
      bool live;
      bool merged;