New upstream version 19.0.3+dfsg1
This commit is contained in:
parent
3708b8e092
commit
1f1bbb3518
534 changed files with 13862 additions and 2459 deletions
|
|
@ -49,6 +49,10 @@
|
|||
"name": "EU: London, UK",
|
||||
"url": "rtmp://live-lhr.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "EU: Madrid, Spain",
|
||||
"url": "rtmp://live-mad.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "EU: Milan, Italy",
|
||||
"url": "rtmp://live-mil.twitch.tv/app"
|
||||
|
|
@ -65,6 +69,10 @@
|
|||
"name": "EU: Stockholm, SE",
|
||||
"url": "rtmp://live-arn.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "EU: Vienna, Austria",
|
||||
"url": "rtmp://live-vie.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "EU: Warsaw, Poland",
|
||||
"url": "rtmp://live-waw.twitch.tv/app"
|
||||
|
|
@ -95,20 +103,32 @@
|
|||
},
|
||||
{
|
||||
"name": "South America: Rio de Janeiro, Brazil",
|
||||
"url": "rtmp://live-gig.twitch.tv/app"
|
||||
"url": "rtmp://live-rio.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "South America: Sao Paulo, Brazil",
|
||||
"url": "rtmp://live-gru.twitch.tv/app"
|
||||
"url": "rtmp://live-sao.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US Central: Dallas, TX",
|
||||
"url": "rtmp://live-dfw.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US Central: Denver, CO",
|
||||
"url": "rtmp://live-den.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US Central: Houston, TX",
|
||||
"url": "rtmp://live-hou.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US East: Ashburn, VA",
|
||||
"url": "rtmp://live-iad.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US East: Atlanta, GA",
|
||||
"url": "rtmp://live-atl.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US East: Chicago",
|
||||
"url": "rtmp://live-ord.twitch.tv/app"
|
||||
|
|
@ -125,6 +145,10 @@
|
|||
"name": "US West: Los Angeles, CA",
|
||||
"url": "rtmp://live-lax.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US West: Phoenix, AZ",
|
||||
"url": "rtmp://live-phx.twitch.tv/app"
|
||||
},
|
||||
{
|
||||
"name": "US West: San Jose, CA",
|
||||
"url": "rtmp://live-sjc.twitch.tv/app"
|
||||
|
|
@ -136,7 +160,7 @@
|
|||
],
|
||||
"recommended": {
|
||||
"keyint": 2,
|
||||
"max video bitrate": 3500,
|
||||
"max video bitrate": 6000,
|
||||
"max audio bitrate": 160,
|
||||
"x264opts": "scenecut=0"
|
||||
}
|
||||
|
|
@ -161,7 +185,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"name": "hitbox.tv",
|
||||
"name": "Smashcast",
|
||||
"common": true,
|
||||
"servers": [
|
||||
{
|
||||
|
|
@ -346,27 +370,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Livecoding.tv",
|
||||
"common": true,
|
||||
"servers": [
|
||||
{
|
||||
"name": "United States",
|
||||
"url": "rtmp://usmedia3.livecoding.tv/livecodingtv"
|
||||
},
|
||||
{
|
||||
"name": "EU",
|
||||
"url": "rtmp://eumedia1.livecoding.tv/livecodingtv"
|
||||
},
|
||||
{
|
||||
"name": "Asia Pacific",
|
||||
"url": "rtmp://apmedia1.livecoding.tv/livecodingtv"
|
||||
}
|
||||
],
|
||||
"recommended": {
|
||||
"max video bitrate": 2300
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "WatchPeopleCode.com",
|
||||
"servers": [
|
||||
|
|
@ -514,15 +517,6 @@
|
|||
"max audio bitrate": 160
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "connectcast.tv",
|
||||
"servers": [
|
||||
{
|
||||
"name": "Default",
|
||||
"url": "rtmp://stream.connectcast.tv/live"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "CyberGame.TV",
|
||||
"servers": [
|
||||
|
|
@ -536,19 +530,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "CashPlay.tv",
|
||||
"servers": [
|
||||
{
|
||||
"name": "Primary, UK",
|
||||
"url": "rtmp://live.cashplay.tv/live"
|
||||
},
|
||||
{
|
||||
"name": "Low Priority, DE",
|
||||
"url": "rtmp://de.live.cashplay.tv/live"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "DJlive.pl",
|
||||
"servers": [
|
||||
|
|
@ -612,10 +593,6 @@
|
|||
"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"
|
||||
|
|
@ -636,6 +613,10 @@
|
|||
"name": "Asia (Singapore)",
|
||||
"url": "rtmp://singapore.restream.io/live"
|
||||
},
|
||||
{
|
||||
"name": "Asia (Seoul, South Korea)",
|
||||
"url": "rtmp://seoul.restream.io/live"
|
||||
},
|
||||
{
|
||||
"name": "Australia (Sydney)",
|
||||
"url": "rtmp://au.restream.io/live"
|
||||
|
|
@ -694,11 +675,11 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"name": "Stre.am",
|
||||
"name": "Stream.live",
|
||||
"servers": [
|
||||
{
|
||||
"name": "Default",
|
||||
"url": "rtmp://media.stre.am:1935/live"
|
||||
"url": "rtmp://media.stream.live:1935/live"
|
||||
}
|
||||
],
|
||||
"recommended": {
|
||||
|
|
@ -838,8 +819,8 @@
|
|||
"recommended": {
|
||||
"keyint": 2,
|
||||
"profile": "main",
|
||||
"max video bitrate": 2000,
|
||||
"max audio bitrate": 160
|
||||
"max video bitrate": 3500,
|
||||
"max audio bitrate": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -850,6 +831,15 @@
|
|||
"url": "rtmp://plive.pandora.tv:80/mediaHub"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "LiveStream",
|
||||
"servers": [
|
||||
{
|
||||
"name": "Primary",
|
||||
"url": "rtmp://rtmpin.livestreamingest.com/rtmpin"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue