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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2017-03-06 11:53:52 +01:00
commit 25ddaa3595
13 changed files with 639 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_http_internal.cpp
View file

@ -89,6 +89,7 @@ namespace Mist {
//capa["optional"]["wrappers"]["allowed"].append("polytrope"); //currently borked
capa["optional"]["wrappers"]["allowed"].append("flash_strobe");
capa["optional"]["wrappers"]["allowed"].append("silverlight");
capa["optional"]["wrappers"]["allowed"].append("img");
capa["optional"]["wrappers"]["option"] = "--wrappers";
capa["optional"]["wrappers"]["short"] = "w";
cfg->addConnectorOptions(8080, capa);
@ -589,6 +590,11 @@ namespace Mist {
response.append((char*)video_js, (size_t)video_js_len);
used = true;
}
if (it->asStringRef() == "img"){
#include "img.js.h"
response.append((char*)img_js, (size_t)img_js_len);
used = true;
}
if (!used) {
WARN_MSG("Unknown player type: %s",it->asStringRef().c_str());
}