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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2017-11-07 14:30:19 +01:00
commit e58a24c239
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/output/output_http.cpp
View file

@ -227,6 +227,7 @@ namespace Mist {
} }
INFO_MSG("Received request %s", H.getUrl().c_str()); INFO_MSG("Received request %s", H.getUrl().c_str());
initialize();
if (H.GetVar("audio") != "" || H.GetVar("video") != ""){ if (H.GetVar("audio") != "" || H.GetVar("video") != ""){
selectedTracks.clear(); selectedTracks.clear();
if (H.GetVar("audio") != ""){ if (H.GetVar("audio") != ""){
@ -255,6 +256,8 @@ namespace Mist {
for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){ for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){
selectedTracks.erase(*it); selectedTracks.erase(*it);
} }
}else{
selectDefaultTracks();
} }
onHTTP(); onHTTP();

2
src/output/output_progressive_mp4.cpp
View file

@ -405,7 +405,7 @@ namespace Mist {
temp.time = thisTrack.firstms;//timeplace of frame temp.time = thisTrack.firstms;//timeplace of frame
temp.index = 0; temp.index = 0;
temp.size = thisTrack.parts[0].getDuration(); temp.size = thisTrack.parts[0].getDuration();
INFO_MSG("adding to sortSet: tid %lu time %lu", temp.trackID, temp.time); HIGH_MSG("Header sortSet: tid %lu time %lu", temp.trackID, temp.time);
sortSet.insert(temp); sortSet.insert(temp);
} }
while (!sortSet.empty()) { while (!sortSet.empty()) {