From 48185cc404d441552b85d798b851e34a96ac2c88 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sun, 15 May 2016 12:23:09 -0700
Subject: [PATCH] rtmp-services: Update restream.io

---
 plugins/rtmp-services/data/package.json  |  4 +-
 plugins/rtmp-services/data/services.json | 75 ++++++++++++------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index ecf6428f4..a8a8b6341 100644
--- a/plugins/rtmp-services/data/package.json
+++ b/plugins/rtmp-services/data/package.json
@@ -1,10 +1,10 @@
 {
 	"url": "https://obsproject.com/obs2_update/rtmp-services",
-	"version": 20,
+	"version": 21,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 20
+			"version": 21
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index 9c91d18e6..50a26d7cc 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -314,43 +314,6 @@
                 }
             ]
         },
-        {
-            "name": "Restream.io",
-            "servers": [
-                {
-                    "name": "EU-West (Amsterdam, NL)",
-                    "url": "rtmp://eu-ams.restream.io/live"
-                },
-                {
-                    "name": "EU-Central (Frankfurt, DE)",
-                    "url": "rtmp://eu.restream.io/live"
-                },
-                {
-                    "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-East (Washington, DC)",
-                    "url": "rtmp://us-east.restream.io/live"
-                },
-                {
-                    "name": "AU (Sydney)",
-                    "url": "rtmp://au.restream.io/live"
-                },
-                {
-                    "name": "AU-Secondary (Sydney)",
-                    "url": "rtmp://au-secondary.restream.io/live"
-                },
-                {
-                    "name": "SA (Saint Paul, Brazil)",
-                    "url": "rtmp://sa.restream.io/live"
-                }
-            ]
-        },
         {
             "name": "mSportz",
             "servers": [
@@ -514,6 +477,44 @@
                 "max video bitrate": 2000,
                 "max audio bitrate": 160
             }
+        },
+        {
+            "name": "Restream.io",
+            "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-East (Washington, D.C.)",
+                    "url": "rtmp://us-east.restream.io/live"
+                },
+                {
+                    "name": "US-Central (Dallas, TX)",
+                    "url": "rtmp://us-central.restream.io/live"
+                },
+                {
+                    "name": "EU-Central (Frankfurt, Germany)",
+                    "url": "rtmp://eu.restream.io/live"
+                },
+                {
+                    "name": "EU-West (London, GB)",
+                    "url": "rtmp://eu-london.restream.io/live"
+                },
+                {
+                    "name": "Australia (Sydney)",
+                    "url": "rtmp://au-secondary.restream.io/live"
+                },
+                {
+                    "name": "South America (Sao Paulo, Brazil)",
+                    "url": "rtmp://sa.restream.io/live"
+                }
+            ]
         }
     ]
 }
-- 
GitLab