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 2018-05-16 11:10:55 +02:00
commit a084005644
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/output/output_http_internal.cpp
View file

@ -619,6 +619,9 @@ namespace Mist {
} }
std::string response; std::string response;
std::string rURL = H.url; std::string rURL = H.url;
if(method != "OPTIONS" && method != "HEAD"){
initialize();
}
H.Clean(); H.Clean();
H.SetHeader("Server", "MistServer/" PACKAGE_VERSION); H.SetHeader("Server", "MistServer/" PACKAGE_VERSION);
H.setCORSHeaders(); H.setCORSHeaders();
@ -632,7 +635,6 @@ namespace Mist {
H.Clean(); H.Clean();
return; return;
} }
initialize();
response = "// Generating info code for stream " + streamName + "\n\nif (!mistvideo){var mistvideo = {};}\n"; response = "// Generating info code for stream " + streamName + "\n\nif (!mistvideo){var mistvideo = {};}\n";
JSON::Value json_resp = getStatusJSON(reqHost, useragent); JSON::Value json_resp = getStatusJSON(reqHost, useragent);
if (rURL.substr(0, 6) != "/json_"){ if (rURL.substr(0, 6) != "/json_"){

1
src/output/output_progressive_mp4.cpp
View file

@ -227,7 +227,6 @@ namespace Mist{
elstBox.setMediaRateFraction(1, 0); elstBox.setMediaRateFraction(1, 0);
}else{ }else{
elstBox.setCount(1); elstBox.setCount(1);
elstBox.setSegmentDuration(0, tDuration); elstBox.setSegmentDuration(0, tDuration);
elstBox.setMediaTime(0, 0); elstBox.setMediaTime(0, 0);
elstBox.setMediaRateInteger(0, 1); elstBox.setMediaRateInteger(0, 1);