Merge pull request #592 from JamyDev/master

Add new Beam.pro ingests
master
Gol-D-Ace 2016-08-12 02:58:28 +02:00 committed by GitHub
commit 1797126a95
2 changed files with 28 additions and 4 deletions

View File

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

View File

@ -258,17 +258,41 @@
"name": "EU: Amsterdam", "name": "EU: Amsterdam",
"url": "rtmp://ingest-ams.beam.pro:1935/beam" "url": "rtmp://ingest-ams.beam.pro:1935/beam"
}, },
{
"name": "EU: Milan",
"url": "rtmp://ingest-mil.beam.pro:1935/beam"
},
{
"name": "EU: Paris",
"url": "rtmp://ingest-par.beam.pro:1935/beam"
},
{ {
"name": "EU: Frankfurt", "name": "EU: Frankfurt",
"url": "rtmp://ingest-fra.beam.pro:1935/beam" "url": "rtmp://ingest-fra.beam.pro:1935/beam"
}, },
{
"name": "Brazil: Sao Paulo",
"url": "rtmp://ingest-sao.beam.pro:1935/beam"
},
{ {
"name": "Australia: Melbourne", "name": "Australia: Melbourne",
"url": "rtmp://ingest-mel.beam.pro:1935/beam" "url": "rtmp://ingest-mel.beam.pro:1935/beam"
}, },
{ {
"name": "Brazil: Sao Paulo", "name": "Australia: Sydney",
"url": "rtmp://ingest-sao.beam.pro:1935/beam" "url": "rtmp://ingest-syd.beam.pro:1935/beam"
},
{
"name": "Mexico: Mexico City",
"url": "rtmp://ingest-mex.beam.pro:1935/beam"
},
{
"name": "Asia: Hong Kong",
"url": "rtmp://ingest-hkg.beam.pro:1935/beam"
},
{
"name": "Asia: Tokyo",
"url": "rtmp://ingest-tok.beam.pro:1935/beam"
} }
], ],
"recommended": { "recommended": {