Merge branch 'development' into LTS_development
This commit is contained in:
commit
c5cb12b843
1 changed files with 2 additions and 5 deletions
|
@ -61,11 +61,8 @@ namespace Mist {
|
||||||
capa["codecs"][0u][0u].append("H264");
|
capa["codecs"][0u][0u].append("H264");
|
||||||
capa["codecs"][0u][1u].append("AAC");
|
capa["codecs"][0u][1u].append("AAC");
|
||||||
capa["methods"][0u]["handler"] = "http";
|
capa["methods"][0u]["handler"] = "http";
|
||||||
capa["methods"][0u]["type"] = "html5/application/vnd.ms-ss";
|
capa["methods"][0u]["type"] = "silverlight";
|
||||||
capa["methods"][0u]["priority"] = 9ll;
|
capa["methods"][0u]["priority"] = 1ll;
|
||||||
capa["methods"][1u]["handler"] = "http";
|
|
||||||
capa["methods"][1u]["type"] = "silverlight";
|
|
||||||
capa["methods"][1u]["priority"] = 1ll;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OutHSS::sendNext() {
|
void OutHSS::sendNext() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue