New upstream version 18.0.1+dfsg1

This commit is contained in:
Sebastian Ramacher 2017-04-19 21:54:15 +02:00
parent 6efda2859e
commit f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions

View file

@ -0,0 +1,10 @@
StreamingServices="Voogedastuse teenus"
CustomStreamingServer="Kohandatud voogedastuse Server"
Service="Teenus"
Server="Server"
StreamKey="Voogedastuse võti"
UseAuth="Kasuta autentimist"
Username="Kasutajanimi"
Password="Salasõna"
ShowAll="Näita kõiki teenuseid"

View file

@ -1,10 +1,10 @@
{
"url": "https://obsproject.com/obs2_update/rtmp-services",
"version": 38,
"version": 52,
"files": [
{
"name": "services.json",
"version": 38
"version": 52
}
]
}

View file

@ -41,10 +41,18 @@
"name": "EU: Frankfurt, DE",
"url": "rtmp://live-fra.twitch.tv/app"
},
{
"name": "EU: Lisbon, Portugal",
"url": "rtmp://live-lis.twitch.tv/app"
},
{
"name": "EU: London, UK",
"url": "rtmp://live-lhr.twitch.tv/app"
},
{
"name": "EU: Milan, Italy",
"url": "rtmp://live-mil.twitch.tv/app"
},
{
"name": "EU: Paris, FR",
"url": "rtmp://live-cdg.twitch.tv/app"
@ -61,6 +69,14 @@
"name": "EU: Warsaw, Poland",
"url": "rtmp://live-waw.twitch.tv/app"
},
{
"name": "NA: Mexico City",
"url": "rtmp://live-qro.twitch.tv/app"
},
{
"name": "NA: Toronto, Canada",
"url": "rtmp://live-yto.twitch.tv/app"
},
{
"name": "South America: Argentina",
"url": "rtmp://live-eze.twitch.tv/app"
@ -69,6 +85,14 @@
"name": "South America: Chile",
"url": "rtmp://live-scl.twitch.tv/app"
},
{
"name": "South America: Lima, Peru",
"url": "rtmp://live-lim.twitch.tv/app"
},
{
"name": "South America: Medellin, Columbia",
"url": "rtmp://live-mde.twitch.tv/app"
},
{
"name": "South America: Rio de Janeiro, Brazil",
"url": "rtmp://live-gig.twitch.tv/app"
@ -131,9 +155,8 @@
}
],
"recommended": {
"keyint": 4,
"profile": "main",
"max video bitrate": 18000,
"keyint": 2,
"max video bitrate": 51000,
"max audio bitrate": 160
}
},
@ -177,10 +200,6 @@
"name": "Russia: Moscow",
"url": "rtmp://live.dme.hitbox.tv/push"
},
{
"name": "US-East: Washington",
"url": "rtmp://live.vgn.hitbox.tv/push"
},
{
"name": "US-East: New York - 1",
"url": "rtmp://live.jfk.hitbox.tv/push"
@ -273,6 +292,10 @@
"name": "EU: Frankfurt",
"url": "rtmp://ingest-fra.beam.pro:1935/beam"
},
{
"name": "EU: Oslo",
"url": "rtmp://ingest-osl.beam.pro:1935/beam"
},
{
"name": "Brazil: Sao Paulo",
"url": "rtmp://ingest-sao.beam.pro:1935/beam"
@ -296,12 +319,20 @@
{
"name": "Asia: Tokyo",
"url": "rtmp://ingest-tok.beam.pro:1935/beam"
},
{
"name": "South Korea: Seoul",
"url": "rtmp://ingest-seo.beam.pro:1935/beam"
},
{
"name": "India: Chennai",
"url": "rtmp://ingest-che.beam.pro:1935/beam"
}
],
"recommended": {
"keyint": 1,
"max audio bitrate": 160,
"max video bitrate": 3500,
"max video bitrate": 10000,
"profile": "main"
}
},
@ -326,10 +357,14 @@
{
"name": "EU",
"url": "rtmp://eumedia1.livecoding.tv/livecodingtv"
},
{
"name": "Asia Pacific",
"url": "rtmp://apmedia1.livecoding.tv/livecodingtv"
}
],
"recommended": {
"max video bitrate": 1300
"max video bitrate": 2300
}
},
{
@ -342,13 +377,19 @@
]
},
{
"name": "mSportz",
"name": "Web.TV",
"servers": [
{
"name": "Primary",
"url": "rtmp://52.21.78.175/mSports"
"url": "rtmp://live3.origins.web.tv/liveext"
}
]
],
"recommended": {
"keyint": 2,
"profile": "main",
"max video bitrate": 3500,
"max audio bitrate": 160
}
},
{
"name": "Switchboard Live (Joicaster)",
@ -414,34 +455,64 @@
]
},
{
"name": "Vaughn Live / iNSTAGIB.tv",
"name": "Vaughn Live / iNSTAGIB",
"servers": [
{
"name": "US: Primary",
"url": "rtmp://live.vaughnsoft.net:443/live"
"url": "rtmp://live.vaughnsoft.net/live"
},
{
"name": "US: San Jose, CA",
"url": "rtmp://live-sjc.vaughnsoft.net:443/live"
"name": "US: Chicago, IL",
"url": "rtmp://live-ord.vaughnsoft.net/live"
},
{
"name": "US: New York, NY",
"url": "rtmp://live-nyc.vaughnsoft.net:443/live"
"name": "US: Denver, CO",
"url": "rtmp://live-den.vaughnsoft.net/live"
},
{
"name": "US: New York 2, NY",
"url": "rtmp://live-nyc2.vaughnsoft.net:443/live"
"name": "US: Los Angeles, CA",
"url": "rtmp://live-lax.vaughnsoft.net/live"
},
{
"name": "EU: Amsterdam, NL",
"url": "rtmp://live-ams.vaughnsoft.net/live"
}
]
],
"recommended": {
"keyint": 2,
"max video bitrate": 3500,
"max audio bitrate": 160
}
},
{
"name": "Streamup",
"name": "Breakers.TV",
"servers": [
{
"name": "Worldwide",
"url": "rtmp://origin.streamuplive.com/app"
"name": "US: Primary",
"url": "rtmp://live.vaughnsoft.net/live"
},
{
"name": "US: Chicago, IL",
"url": "rtmp://live-ord.vaughnsoft.net/live"
},
{
"name": "US: Denver, CO",
"url": "rtmp://live-den.vaughnsoft.net/live"
},
{
"name": "US: Los Angeles, CA",
"url": "rtmp://live-lax.vaughnsoft.net/live"
},
{
"name": "EU: Amsterdam, NL",
"url": "rtmp://live-ams.vaughnsoft.net/live"
}
]
],
"recommended": {
"keyint": 2,
"max video bitrate": 3500,
"max audio bitrate": 160
}
},
{
"name": "connectcast.tv",
@ -452,45 +523,6 @@
}
]
},
{
"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": [
@ -553,23 +585,43 @@
"common": true,
"servers": [
{
"name": "US-West (San Jose, California)",
"url": "rtmp://us-west.restream.io/live"
"name": "EU-West (London, GB)",
"url": "rtmp://eu-london.restream.io/live"
},
{
"name": "US-West (Los Angeles, California)",
"url": "rtmp://us-la.restream.io/live"
"name": "EU-West (Amsterdam, NL)",
"url": "rtmp://eu-ams.restream.io/live"
},
{
"name": "US-West (Seattle, Washington)",
"name": "EU-Central (Frankfurt, DE)",
"url": "rtmp://eu-central.restream.io/live"
},
{
"name": "EU-East (Falkenstein, DE)",
"url": "rtmp://eu-east.restream.io/live"
},
{
"name": "Russia (Moscow)",
"url": "rtmp://ru.restream.io/live"
},
{
"name": "US-West (Seattle, WA)",
"url": "rtmp://us-seattle.restream.io/live"
},
{
"name": "US-Central (Dallas, Texas)",
"name": "US-West (San Jose, CA)",
"url": "rtmp://us-west.restream.io/live"
},
{
"name": "US-West (Los Angeles, CA)",
"url": "rtmp://us-la.restream.io/live"
},
{
"name": "US-Central (Dallas, TX)",
"url": "rtmp://us-central.restream.io/live"
},
{
"name": "US-East (Washington, D.C.)",
"name": "US-East (Washington, DC)",
"url": "rtmp://us-east.restream.io/live"
},
{
@ -577,36 +629,16 @@
"url": "rtmp://na-toronto.restream.io/live"
},
{
"name": "EU-Central (Frankfurt, Germany)",
"url": "rtmp://eu-central.restream.io/live"
},
{
"name": "EU-Central 2 (Frankfurt, Germany)",
"url": "rtmp://eu.restream.io/live"
},
{
"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.restream.io/live"
},
{
"name": "Australia Secondary (Sydney)",
"url": "rtmp://au-secondary.restream.io/live"
},
{
"name": "South America (Sao Paulo, Brazil)",
"name": "SA (Saint Paul, Brazil)",
"url": "rtmp://sa.restream.io/live"
},
{
"name": "Asia (Singapore)",
"url": "rtmp://singapore.restream.io/live"
},
{
"name": "Australia (Sydney)",
"url": "rtmp://au.restream.io/live"
}
],
"recommended": {
@ -661,15 +693,6 @@
}
]
},
{
"name": "Interactive LifeStream",
"servers": [
{
"name": "Default",
"url": "rtmp://lifestreamcdn.com/live/_definst_/doPublish=wls36"
}
]
},
{
"name": "Stre.am",
"servers": [
@ -803,6 +826,30 @@
"max video bitrate": 3000,
"max audio bitrate": 128
}
},
{
"name": "Picarto",
"servers": [
{
"name": "USA/Canada",
"url": "rtmp://live.us.picarto.tv/golive"
}
],
"recommended": {
"keyint": 2,
"profile": "main",
"max video bitrate": 2000,
"max audio bitrate": 160
}
},
{
"name": "Pandora TV Korea",
"servers": [
{
"name": "Default",
"url": "rtmp://plive.pandora.tv:80/mediaHub"
}
]
}
]
}