From 104e5ed550b1ae38cc2facfde2864eb0fe90a2c4 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sun, 6 Jan 2019 14:54:37 +0100 Subject: [PATCH] Fixed friendly name for FLV, JSON and RAW --- src/output/output_json.cpp | 2 +- src/output/output_progressive_flv.cpp | 2 +- src/output/output_raw.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/output/output_json.cpp b/src/output/output_json.cpp index 58d9839c..39609732 100644 --- a/src/output/output_json.cpp +++ b/src/output/output_json.cpp @@ -14,7 +14,7 @@ namespace Mist { void OutJSON::init(Util::Config * cfg){ HTTPOutput::init(cfg); capa["name"] = "JSON"; - capa["name"] = "JSON over HTTP"; + capa["friendly"] = "JSON over HTTP"; capa["desc"] = "Pseudostreaming in JSON format over HTTP"; capa["url_match"] = "/$.json"; capa["codecs"][0u][0u].append("@+meta"); diff --git a/src/output/output_progressive_flv.cpp b/src/output/output_progressive_flv.cpp index 046fec69..8f504549 100644 --- a/src/output/output_progressive_flv.cpp +++ b/src/output/output_progressive_flv.cpp @@ -6,7 +6,7 @@ namespace Mist { void OutProgressiveFLV::init(Util::Config * cfg){ HTTPOutput::init(cfg); 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["url_rel"] = "/$.flv"; capa["url_match"] = "/$.flv"; diff --git a/src/output/output_raw.cpp b/src/output/output_raw.cpp index 8ed57b35..02148e52 100644 --- a/src/output/output_raw.cpp +++ b/src/output/output_raw.cpp @@ -32,7 +32,7 @@ namespace Mist { void OutRaw::init(Util::Config * cfg){ Output::init(cfg); capa["name"] = "RAW"; - capa["name"] = "DTSC over stdout"; + capa["friendly"] = "DTSC over stdout"; capa["desc"] = "Pseudostreaming in DTSC format over standard output"; capa["deps"] = ""; capa["required"]["streamname"]["name"] = "Stream";