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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/stream.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
This commit is contained in:
Thulinma 2019-04-26 17:10:02 +02:00
commit fd34aa7e32
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/output/output.cpp
View file

@ -611,6 +611,7 @@ namespace Mist{
if (noSelAudio && trit->second.type == "audio"){continue;} if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;} if (noSelVideo && trit->second.type == "video"){continue;}
if (noSelSub && (trit->second.type == "subtitle" || trit->second.codec == "subtitle")){continue;} if (noSelSub && (trit->second.type == "subtitle" || trit->second.codec == "subtitle")){continue;}
/*LTS-END*/
//user-agent-check //user-agent-check
bool problems = false; bool problems = false;
if (capa.isMember("exceptions") && capa["exceptions"].isObject() && capa["exceptions"].size()){ if (capa.isMember("exceptions") && capa["exceptions"].isObject() && capa["exceptions"].size()){
@ -622,7 +623,6 @@ namespace Mist{
} }
} }
if (problems){continue;} if (problems){continue;}
/*LTS-END*/
selectedTracks.insert(trit->first); selectedTracks.insert(trit->first);
found = true; found = true;
if (!multiSel){break;} if (!multiSel){break;}
@ -636,6 +636,7 @@ namespace Mist{
if (noSelAudio && trit->second.type == "audio"){continue;} if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;} if (noSelVideo && trit->second.type == "video"){continue;}
if (noSelSub && (trit->second.type == "subtitle" || trit->second.codec == "subtitle")){continue;} if (noSelSub && (trit->second.type == "subtitle" || trit->second.codec == "subtitle")){continue;}
/*LTS-END*/
//user-agent-check //user-agent-check
bool problems = false; bool problems = false;
if (capa.isMember("exceptions") && capa["exceptions"].isObject() && capa["exceptions"].size()){ if (capa.isMember("exceptions") && capa["exceptions"].isObject() && capa["exceptions"].size()){
@ -647,7 +648,6 @@ namespace Mist{
} }
} }
if (problems){continue;} if (problems){continue;}
/*LTS-END*/
selectedTracks.insert(trit->first); selectedTracks.insert(trit->first);
found = true; found = true;
if (!multiSel){break;} if (!multiSel){break;}