Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-07-19 14:20:45 +02:00
commit 8219ac15ca
2 changed files with 2 additions and 0 deletions

View file

@ -725,6 +725,7 @@ namespace Mist {
}
}
H.Clean(); //make sure no parts of old requests are left in any buffers
H.setCORSHeaders();
H.SetHeader("Content-Type", "video/MP4"); //Send the correct content-type for MP4 files
if (!myMeta.live) {
H.SetHeader("Accept-Ranges", "bytes, parsec");

View file

@ -58,6 +58,7 @@ namespace Mist {
}
void OutProgressiveSRT::sendHeader(){
H.setCORSHeaders();
if (webVTT){
H.SetHeader("Content-Type", "text/vtt; charset=utf-8");
}else{