hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge error.

Browse source
This commit is contained in:
Thulinma 2015-02-18 02:58:14 +01:00
parent aa00b31ddb
commit 32dfc25ee9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_progressive_mp4.cpp
View file

@ -118,7 +118,7 @@ namespace Mist {
ase.setSampleRate(thisTrack.rate); ase.setSampleRate(thisTrack.rate);
ase.setChannelCount(thisTrack.channels); ase.setChannelCount(thisTrack.channels);
ase.setSampleSize(thisTrack.size); ase.setSampleSize(thisTrack.size);
MP4::ESDS esdsBox(""); MP4::ESDS esdsBox(thisTrack.init);
ase.setCodecBox(esdsBox); ase.setCodecBox(esdsBox);
stsdBox.setEntry(ase,0); stsdBox.setEntry(ase,0);
} }