From d048aaccc4fc43331772ecb73d11229bef43076b Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 30 May 2016 16:03:52 +0200
Subject: [PATCH] Forwardported some free version changes to Pro.

---
 src/controller/controller_streams.cpp | 1 +
 src/input/input_buffer.h              | 4 ++--
 src/io.cpp                            | 1 -
 src/output/output_rtmp.cpp            | 2 --
 src/output/output_rtmp.h              | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index fec98303..f30e1a29 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -316,3 +316,4 @@ namespace Controller {
   }
 
 } //Controller namespace
+
diff --git a/src/input/input_buffer.h b/src/input/input_buffer.h
index 21221216..c8d18d0a 100644
--- a/src/input/input_buffer.h
+++ b/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();
diff --git a/src/io.cpp b/src/io.cpp
index f55fce2a..992a8fa4 100644
--- a/src/io.cpp
+++ b/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
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 54490e3d..b3da1b94 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -150,8 +150,6 @@ namespace Mist {
     isPushing = false;
   }
 
-  OutRTMP::~OutRTMP() {}
-  
   bool OutRTMP::listenMode(){
     return !(config->getString("target").size());
   }
diff --git a/src/output/output_rtmp.h b/src/output/output_rtmp.h
index 8e6aebdf..700624e8 100644
--- a/src/output/output_rtmp.h
+++ b/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();