Merge branch 'development' into LTS_development

src/output/output.cpp

@@ -25,6 +25,7 @@
 
 namespace Mist{
   JSON::Value Output::capa = JSON::Value();
+  Util::Config * Output::config = NULL;
 
   int getDTSCLen(char * mapped, long long int offset){
     return Bit::btohl(mapped + offset + 4);

src/output/output.h

@@ -80,6 +80,7 @@ namespace Mist {
       virtual void sendHeader();
       virtual void onFail();
       virtual void requestHandler();
+      static Util::Config * config;
     private://these *should* not be messed with in child classes.
       /*LTS-START*/
       void Log(std::string type, std::string message);

src/output/output_ebml.h

@@ -1,3 +1,4 @@
+#pragma once
 #include "output_http.h"
 
 namespace Mist{
@@ -7,7 +8,7 @@ namespace Mist{
     static void init(Util::Config *cfg);
     void onHTTP();
     void sendNext();
-    void sendHeader();
+    virtual void sendHeader();
     uint32_t clusterSize(uint64_t start, uint64_t end);
 
   private: