From ccb932105a5bc3e5c1786febfd35001fc83ecf5d Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 23 Nov 2016 15:05:39 +0100
Subject: [PATCH] Fixed a stupid merge error in MP4 output

---
 src/output/output_progressive_mp4.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp
index 1bb9a5ca..8b1a9136 100644
--- a/src/output/output_progressive_mp4.cpp
+++ b/src/output/output_progressive_mp4.cpp
@@ -36,6 +36,9 @@ namespace Mist {
   
   ///\todo This function does not indicate errors anywhere... maybe fix this...
   std::string OutProgressiveMP4::DTSCMeta2MP4Header(long long & size){
+    //Make sure we have a proper being value for the size...
+    size = 0;
+    //Stores the result of the function
     std::stringstream header;
     //Determines whether the outputfile is larger than 4GB, in which case we need to use 64-bit boxes for offsets
     bool useLargeBoxes = (estimateFileSize() > 0xFFFFFFFFull);