Fixed merge error.

2015-02-18 02:58:14 +01:00 · 2015-02-18 02:58:14 +01:00 · 32dfc25ee9
commit 32dfc25ee9
parent aa00b31ddb
1 changed files with 1 additions and 1 deletions
--- 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);
                }