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

Fixed 32-bit compiling of MP4 output

Browse source
This commit is contained in:
Thulinma 2017-11-02 11:04:29 +01:00
parent 6bf980f706
commit a634f4a738
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_progressive_mp4.cpp
View file

@ -619,7 +619,7 @@ namespace Mist {
//Fun fact! Firefox cares about the ordering here. //Fun fact! Firefox cares about the ordering here.
//It doesn't care about the order or track IDs in the header. //It doesn't care about the order or track IDs in the header.
//But - the first TRAF must be a video TRAF, if video is present. //But - the first TRAF must be a video TRAF, if video is present.
std::deque<std::map<long unsigned int, fragSet>::iterator> sortedTracks; std::deque<std::map<size_t, fragSet>::iterator> sortedTracks;
for (std::map<size_t, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) { for (std::map<size_t, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) {
if (myMeta.tracks[it->first].type == "video"){ if (myMeta.tracks[it->first].type == "video"){
sortedTracks.push_front(it); sortedTracks.push_front(it);
@ -631,9 +631,9 @@ namespace Mist {
} }
} }
for (std::deque<std::map<long unsigned int, fragSet>::iterator>::iterator ti = sortedTracks.begin(); ti != sortedTracks.end(); ++ti) { for (std::deque<std::map<size_t, fragSet>::iterator>::iterator ti = sortedTracks.begin(); ti != sortedTracks.end(); ++ti) {
std::map<long unsigned int, fragSet>::iterator & it = *ti; std::map<size_t, fragSet>::iterator & it = *ti;
unsigned int tid = it->first; size_t tid = it->first;
DTSC::Track & thisTrack = myMeta.tracks[tid]; DTSC::Track & thisTrack = myMeta.tracks[tid];
MP4::TRAF trafBox; MP4::TRAF trafBox;
MP4::TFHD tfhdBox; MP4::TFHD tfhdBox;