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 2019-01-07 10:15:30 +01:00
commit b99d8cf330
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_json.cpp
View file

@ -14,7 +14,7 @@ namespace Mist {
void OutJSON::init(Util::Config * cfg){ void OutJSON::init(Util::Config * cfg){
HTTPOutput::init(cfg); HTTPOutput::init(cfg);
capa["name"] = "JSON"; capa["name"] = "JSON";
capa["name"] = "JSON over HTTP"; capa["friendly"] = "JSON over HTTP";
capa["desc"] = "Pseudostreaming in JSON format over HTTP"; capa["desc"] = "Pseudostreaming in JSON format over HTTP";
capa["url_match"] = "/$.json"; capa["url_match"] = "/$.json";
capa["codecs"][0u][0u].append("@+meta"); capa["codecs"][0u][0u].append("@+meta");

2
src/output/output_progressive_flv.cpp
View file

@ -6,7 +6,7 @@ namespace Mist {
void OutProgressiveFLV::init(Util::Config * cfg){ void OutProgressiveFLV::init(Util::Config * cfg){
HTTPOutput::init(cfg); HTTPOutput::init(cfg);
capa["name"] = "FLV"; capa["name"] = "FLV";
capa["name"] = "Flash progressive over HTTP (FLV)"; capa["friendly"] = "Flash progressive over HTTP (FLV)";
capa["desc"] = "Pseudostreaming in Adobe Flash FLV format over HTTP"; capa["desc"] = "Pseudostreaming in Adobe Flash FLV format over HTTP";
capa["url_rel"] = "/$.flv"; capa["url_rel"] = "/$.flv";
capa["url_match"] = "/$.flv"; capa["url_match"] = "/$.flv";

2
src/output/output_raw.cpp
View file

@ -32,7 +32,7 @@ namespace Mist {
void OutRaw::init(Util::Config * cfg){ void OutRaw::init(Util::Config * cfg){
Output::init(cfg); Output::init(cfg);
capa["name"] = "RAW"; capa["name"] = "RAW";
capa["name"] = "DTSC over stdout"; capa["friendly"] = "DTSC over stdout";
capa["desc"] = "Pseudostreaming in DTSC format over standard output"; capa["desc"] = "Pseudostreaming in DTSC format over standard output";
capa["deps"] = ""; capa["deps"] = "";
capa["required"]["streamname"]["name"] = "Stream"; capa["required"]["streamname"]["name"] = "Stream";