Forwardported some free version changes to Pro.

src/controller/controller_streams.cpp

@@ -316,3 +316,4 @@ namespace Controller {
   }
 
 } //Controller namespace
+

src/input/input_buffer.h

@@ -15,8 +15,8 @@ namespace Mist {
       unsigned int cutTime;
       unsigned int segmentSize; /*LTS*/
       unsigned int lastReTime; /*LTS*/
-      bool hasPush; /*LTS*/
-      bool resumeMode; /*LTS*/
+      bool hasPush;
+      bool resumeMode;
     protected:
       //Private Functions
       bool setup();

src/io.cpp

@@ -58,7 +58,6 @@ namespace Mist {
   }
   /*LTS-END*/
 
-
   bool InOutBase::bufferStart(unsigned long tid, unsigned long pageNumber) {
     VERYHIGH_MSG("bufferStart for stream %s, track %lu, page %lu", streamName.c_str(), tid, pageNumber);
     //Initialize the stream metadata if it does not yet exist

src/output/output_rtmp.cpp

@@ -150,8 +150,6 @@ namespace Mist {
     isPushing = false;
   }
 
-  OutRTMP::~OutRTMP() {}
-  
   bool OutRTMP::listenMode(){
     return !(config->getString("target").size());
   }

src/output/output_rtmp.h

@@ -9,7 +9,6 @@ namespace Mist {
  class OutRTMP : public Output {
     public:
       OutRTMP(Socket::Connection & conn);
-      ~OutRTMP();
       static void init(Util::Config * cfg);
       void onRequest();
       void sendNext();