From 32dfc25ee94d6a0636b2556d97214338dfc73c7a Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 18 Feb 2015 02:58:14 +0100
Subject: [PATCH] Fixed merge error.

---
 src/output/output_progressive_mp4.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp
index 9c986e23..f0a34380 100644
--- a/src/output/output_progressive_mp4.cpp
+++ b/src/output/output_progressive_mp4.cpp
@@ -118,7 +118,7 @@ namespace Mist {
                   ase.setSampleRate(thisTrack.rate);
                   ase.setChannelCount(thisTrack.channels);
                   ase.setSampleSize(thisTrack.size);
-                  MP4::ESDS esdsBox("");
+                  MP4::ESDS esdsBox(thisTrack.init);
                   ase.setCodecBox(esdsBox);
                   stsdBox.setEntry(ase,0);
                 }