Merge branch 'development' into LTS_development

# Conflicts:
#	lib/bitfields.h
#	src/input/input.cpp
#	src/output/output.cpp

src/input/input.cpp

@@ -611,6 +611,20 @@ namespace Mist {
       }
     }
   }
+  
+  void Input::trackSelect(std::string trackSpec){
+    selectedTracks.clear();
+    size_t index;
+    while (trackSpec != "") {
+      index = trackSpec.find(' ');
+      selectedTracks.insert(atoi(trackSpec.substr(0, index).c_str()));
+      if (index != std::string::npos) {
+        trackSpec.erase(0, index + 1);
+      } else {
+        trackSpec = "";
+      }
+    }
+  }
 
   void Input::parseHeader() {
     if (hasSrt){

src/input/input.h

@@ -46,7 +46,7 @@ namespace Mist {
       void quitPlay();
       void checkHeaderTimes(std::string streamFile);
       virtual void removeUnused();
-      virtual void trackSelect(std::string trackSpec){};
+      virtual void trackSelect(std::string trackSpec);
       virtual void userCallback(char * data, size_t len, unsigned int id);
       virtual void convert();
       virtual void serve();