From 48fc0fc120e69b7ed9a835faabc05f0cde498d4f Mon Sep 17 00:00:00 2001
From: derrod <xlnedder@gmail.com>
Date: Fri, 25 Aug 2017 16:11:18 +0200
Subject: [PATCH] rtmp-services: Add new twitch ingest servers

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

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index e833f9efe..d47de7085 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": 69,
+	"version": 70,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 69
+			"version": 70
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index d60881730..1d433cd49 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -33,6 +33,10 @@
                     "name": "EU: Amsterdam, NL",
                     "url": "rtmp://live-ams.twitch.tv/app"
                 },
+                {
+                    "name": "EU: Berlin, DE",
+                    "url": "rtmp://live-ber.twitch.tv/app"
+                },
                 {
                     "name": "EU: Frankfurt, DE",
                     "url": "rtmp://live-fra.twitch.tv/app"
@@ -49,6 +53,10 @@
                     "name": "EU: Madrid, Spain",
                     "url": "rtmp://live-mad.twitch.tv/app"
                 },
+                {
+                    "name": "EU: Marseille, FR",
+                    "url": "rtmp://live-mrs.twitch.tv/app"
+                },
                 {
                     "name": "EU: Milan, Italy",
                     "url": "rtmp://live-mil.twitch.tv/app"
-- 
GitLab