Browse Source

Merge pull request #700 from Dead133/master

rtmp-services: Update ingests list for Restream.io
Jim 9 years ago
parent
commit
22b1306eb1
2 changed files with 27 additions and 31 deletions
  1. 2 2
      plugins/rtmp-services/data/package.json
  2. 25 29
      plugins/rtmp-services/data/services.json

+ 2 - 2
plugins/rtmp-services/data/package.json

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

+ 25 - 29
plugins/rtmp-services/data/services.json

@@ -557,60 +557,56 @@
             "common": true,
             "servers": [
                 {
-                    "name": "US-West (San Jose, California)",
-                    "url": "rtmp://us-west.restream.io/live"
-                },
-                {
-                    "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": "EU-West (London, GB)",
+                    "url": "rtmp://eu-london.restream.io/live"
                 },
                 {
-                    "name": "US-Central (Dallas, Texas)",
-                    "url": "rtmp://us-central.restream.io/live"
+                    "name": "EU-West (Amsterdam, NL)",
+                    "url": "rtmp://eu-ams.restream.io/live"
                 },
                 {
-                    "name": "US-East (Washington, D.C.)",
-                    "url": "rtmp://us-east.restream.io/live"
+                    "name": "EU-Central (Frankfurt, DE)",
+                    "url": "rtmp://eu-central.restream.io/live"
                 },
                 {
-                    "name": "NA-East (Toronto, Canada)",
-                    "url": "rtmp://na-toronto.restream.io/live"
+                    "name": "EU-East (Falkenstein, DE)",
+                    "url": "rtmp://eu-east.restream.io/live"
                 },
                 {
-                    "name": "EU-Central (Frankfurt, Germany)",
-                    "url": "rtmp://eu-central.restream.io/live"
+                    "name": "Russia (Moscow)",
+                    "url": "rtmp://ru.restream.io/live"
                 },
                 {
-                    "name": "EU-Central 2 (Frankfurt, Germany)",
-                    "url": "rtmp://eu.restream.io/live"
+                    "name": "US-West (Seattle, WA)",
+                    "url": "rtmp://us-seattle.restream.io/live"
                 },
                 {
-                    "name": "EU-West (Amsterdam, Netherlands)",
-                    "url": "rtmp://eu-ams.restream.io/live"
+                    "name": "US-West (San Jose, CA)",
+                    "url": "rtmp://us-west.restream.io/live"
                 },
                 {
-                    "name": "EU-West (London, Great Britain)",
-                    "url": "rtmp://eu-london.restream.io/live"
+                    "name": "US-Central (Dallas, TX)",
+                    "url": "rtmp://us-central.restream.io/live"
                 },
                 {
-                    "name": "Australia (Sydney)",
-                    "url": "rtmp://au.restream.io/live"
+                    "name": "US-East (Washington, DC)",
+                    "url": "rtmp://us-east.restream.io/live"
                 },
                 {
-                    "name": "Australia Secondary (Sydney)",
-                    "url": "rtmp://au-secondary.restream.io/live"
+                    "name": "NA-East (Toronto, Canada)",
+                    "url": "rtmp://na-toronto.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": {