From 8d3daf4def09167dcde945744c6c7024424f0a99 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Thu, 19 May 2016 10:32:48 +0200 Subject: [PATCH] Swapped RTMP and HDS in priority ordering for playback options. --- src/output/output_hds.cpp | 2 +- src/output/output_rtmp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp index ca5fb2a9..0acfa613 100644 --- a/src/output/output_hds.cpp +++ b/src/output/output_hds.cpp @@ -172,7 +172,7 @@ namespace Mist { capa["codecs"][0u][1u].append("G711mu"); capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["type"] = "flash/11"; - capa["methods"][0u]["priority"] = 7ll; + capa["methods"][0u]["priority"] = 6ll; capa["methods"][0u]["player_url"] = "/flashplayer.swf"; cfg->getOption("startpos", true)[0u] = 0ll; } diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp index 03be9a46..80e7639b 100644 --- a/src/output/output_rtmp.cpp +++ b/src/output/output_rtmp.cpp @@ -254,7 +254,7 @@ namespace Mist { capa["codecs"][0u][1u].append("G711mu"); capa["methods"][0u]["handler"] = "rtmp"; capa["methods"][0u]["type"] = "flash/10"; - capa["methods"][0u]["priority"] = 6ll; + capa["methods"][0u]["priority"] = 7ll; capa["methods"][0u]["player_url"] = "/flashplayer.swf"; capa["optional"]["maxkbps"]["name"] = "Max. kbps"; capa["optional"]["maxkbps"]["help"] = "Maximum bitrate to allow in the ingest direction, in kilobits per second.";