New upstream version 0.15.4+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-08-28 14:07:43 +02:00
parent 55d5047af0
commit 67704ac59c
359 changed files with 8423 additions and 1050 deletions

View file

@ -134,7 +134,7 @@
"recommended": {
"keyint": 4,
"profile": "main",
"max video bitrate": 9000,
"max video bitrate": 18000,
"max audio bitrate": 160
}
},
@ -324,43 +324,47 @@
]
},
{
"name": "JOICASTER",
"name": "Switchboard Live (Joicaster)",
"servers": [
{
"name": "U.S. - Washington, DC",
"url": "rtmp://ingest-1.wdc01.joicaster.co/live"
"name": "Default - Performance Global",
"url": "rtmp://ingest-global-a.switchboard.zone/live"
},
{
"name": "U.S. - Dallas, TX",
"url": "rtmp://ingest-1.dal09.joicaster.co/live"
"url": "rtmp://ingest-us-dal.switchboard.zone/live"
},
{
"name": "U.S. - Seattle, WA",
"url": "rtmp://ingest-1.sea01.joicaster.co/live"
"url": "rtmp://ingest-us-sea.switchboard.zone/live"
},
{
"name": "U.S. - Washington, DC",
"url": "rtmp://ingest-us-wdc.switchboard.zone/live"
},
{
"name": "C.A. - Toronto, Canada",
"url": "rtmp://ingest-1.tor01.joicaster.co/live"
"url": "rtmp://ingest-cn-tor.switchboard.zone/live"
},
{
"name": "E.U. - London, England",
"url": "rtmp://ingest-1.lon02.joicaster.co/live"
"url": "rtmp://ingest-eu-lon.switchboard.zone/live"
},
{
"name": "E.U. - Amsterdam, Netherlands",
"url": "rtmp://ingest-1.ams03.joicaster.co/live"
"url": "rtmp://ingest-as-tok.switchboard.zone/live"
},
{
"name": "A.S. - Tokyo, Japan",
"url": "rtmp://ingest-1.tok02.joicaster.co/live"
"url": "rtmp://ingest-as-tok.switchboard.zone/live"
},
{
"name": "A.U. - Melbourne, Australia",
"url": "rtmp://ingest-1.mel01.joicaster.co/live"
"url": "rtmp://ingest-au-mel.switchboard.zone/live"
},
{
"name": "S.A - São Paulo, Brazil",
"url": "rtmp://ingest-1.sao01.joicaster.co/live"
"url": "rtmp://ingest-sa-sao.switchboard.zone/live"
}
]
},
@ -421,6 +425,45 @@
}
]
},
{
"name": "Kamcord",
"servers": [
{
"name": "US East (N. Virginia)",
"url": "rtmp://us-east-1.stream.kamcord.com/live"
},
{
"name": "Asia Pacific (Seoul)",
"url": "rtmp://ap-northeast-2.stream.kamcord.com/live"
},
{
"name": "Asia Pacific (Sydney)",
"url": "rtmp://ap-southeast-2.stream.kamcord.com/live"
},
{
"name": "Asia Pacific (Tokyo)",
"url": "rtmp://ap-northeast-1.stream.kamcord.com/live"
},
{
"name": "EU (Frankfurt)",
"url": "rtmp://eu-central-1.stream.kamcord.com/live"
},
{
"name": "South America (Sao Paulo)",
"url": "rtmp://sa-east-1.stream.kamcord.com/live"
},
{
"name": "US West (N. California)",
"url": "rtmp://us-west-1.stream.kamcord.com/live"
}
],
"recommended": {
"keyint": 2,
"profile": "main",
"max video bitrate": 4000,
"max audio bitrate": 192
}
},
{
"name": "CyberGame.TV",
"servers": [
@ -472,9 +515,9 @@
}
],
"recommended": {
"keyint": 1,
"keyint": 2,
"profile": "main",
"max video bitrate": 2000,
"max video bitrate": 2500,
"max audio bitrate": 160
}
},
@ -490,31 +533,130 @@
"name": "US-West (Los Angeles, California)",
"url": "rtmp://us-la.restream.io/live"
},
{
"name": "US-West (Seattle, Washington)",
"url": "rtmp://us-seattle.restream.io/live"
},
{
"name": "US-Central (Dallas, Texas)",
"url": "rtmp://us-central.restream.io/live"
},
{
"name": "US-East (Washington, D.C.)",
"url": "rtmp://us-east.restream.io/live"
},
{
"name": "US-Central (Dallas, TX)",
"url": "rtmp://us-central.restream.io/live"
"name": "NA-East (Toronto, Canada)",
"url": "rtmp://na-toronto.restream.io/live"
},
{
"name": "EU-Central (Frankfurt, Germany)",
"url": "rtmp://eu.restream.io/live"
},
{
"name": "EU-West (London, GB)",
"name": "EU-West (Amsterdam, Netherlands)",
"url": "rtmp://eu-ams.restream.io/live"
},
{
"name": "EU-West (London, Great Britain)",
"url": "rtmp://eu-london.restream.io/live"
},
{
"name": "Australia (Sydney)",
"url": "rtmp://au-secondary.restream.io/live"
"url": "rtmp://au.restream.io/live"
},
{
"name": "South America (Sao Paulo, Brazil)",
"url": "rtmp://sa.restream.io/live"
}
],
"recommended": {
"keyint": 2
}
},
{
"name": "Nood",
"servers": [
{
"name": "EU Central: Frankfurt, Germany",
"url": "rtmp://broadcast-frf.nood.tv/20D2AB/live"
},
{
"name": "EU North: Amsterdam, Netherlands",
"url": "rtmp://broadcast-ams.nood.tv/20D2AB/live"
},
{
"name": "EU West: Stockholm, Sweden",
"url": "rtmp://broadcast-arn.nood.tv/20D2AB/live"
},
{
"name": "US East: Washington, DC",
"url": "rtmp://broadcast-dca.nood.tv/20D2AB/live"
},
{
"name": "US West: Los Angeles, CA",
"url": "rtmp://broadcast-oxr.nood.tv/20D2AB/live"
},
{
"name": "Australia: Sydney",
"url": "rtmp://broadcast-syd.nood.tv/20D2AB/live"
},
{
"name": "Asia: Hong Kong, China",
"url": "rtmp://broadcast-hhp.nood.tv/20D2AB/live"
}
],
"recommended": {
"keyint": 2,
"profile": "main",
"max video bitrate": 3500,
"max audio bitrate": 192
}
},
{
"name": "Boomstream",
"servers": [
{
"name": "Default",
"url": "rtmp://live.boomstream.com/live"
}
]
},
{
"name": "Interactive LifeStream",
"servers": [
{
"name": "Default",
"url": "rtmp://lifestreamcdn.com/live/_definst_/doPublish=wls36"
}
]
},
{
"name": "Stre.am",
"servers": [
{
"name": "Default",
"url": "rtmp://media.stre.am:1935/live"
}
],
"recommended": {
"keyint": 2,
"profile": "main",
"max video bitrate": 2500,
"max audio bitrate": 160
}
},
{
"name": "Coderwall",
"servers": [
{
"name": "Primary",
"url": "rtmp://live.coderwall.com/coderwall"
}
],
"recommended": {
"max video bitrate": 1500
}
}
]
}