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

Swapped RTMP and HDS in priority ordering for playback options.

Browse source
This commit is contained in:
Thulinma 2016-05-19 10:32:48 +02:00
parent 94020051c4
commit 8d3daf4def
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/output/output_hds.cpp
View file

@ -172,7 +172,7 @@ namespace Mist {
capa["codecs"][0u][1u].append("G711mu"); capa["codecs"][0u][1u].append("G711mu");
capa["methods"][0u]["handler"] = "http"; capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "flash/11"; capa["methods"][0u]["type"] = "flash/11";
capa["methods"][0u]["priority"] = 7ll; capa["methods"][0u]["priority"] = 6ll;
capa["methods"][0u]["player_url"] = "/flashplayer.swf"; capa["methods"][0u]["player_url"] = "/flashplayer.swf";
cfg->getOption("startpos", true)[0u] = 0ll; cfg->getOption("startpos", true)[0u] = 0ll;
} }

2
src/output/output_rtmp.cpp
View file

@ -254,7 +254,7 @@ namespace Mist {
capa["codecs"][0u][1u].append("G711mu"); capa["codecs"][0u][1u].append("G711mu");
capa["methods"][0u]["handler"] = "rtmp"; capa["methods"][0u]["handler"] = "rtmp";
capa["methods"][0u]["type"] = "flash/10"; capa["methods"][0u]["type"] = "flash/10";
capa["methods"][0u]["priority"] = 6ll; capa["methods"][0u]["priority"] = 7ll;
capa["methods"][0u]["player_url"] = "/flashplayer.swf"; capa["methods"][0u]["player_url"] = "/flashplayer.swf";
capa["optional"]["maxkbps"]["name"] = "Max. kbps"; capa["optional"]["maxkbps"]["name"] = "Max. kbps";
capa["optional"]["maxkbps"]["help"] = "Maximum bitrate to allow in the ingest direction, in kilobits per second."; capa["optional"]["maxkbps"]["help"] = "Maximum bitrate to allow in the ingest direction, in kilobits per second.";