From ea0f47e6d28221feccdccd0b1c9e69da033292d5 Mon Sep 17 00:00:00 2001
From: Mark Vaughn <mark@vaughnsoft.com>
Date: Sun, 22 Jan 2017 18:53:31 -0600
Subject: [PATCH] rtmp-services: Update Vaughn Live ingests

Update video ingest servers for Vaughn Live.  Also split Breakers.TV
into its own since it is possibly becoming its own entity soon.

Closes jp9000/obs-studio#771
Closes jp9000/obs-studio#772
---
 plugins/rtmp-services/data/package.json  |  4 +-
 plugins/rtmp-services/data/services.json | 57 ++++++++++++++++++++----
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index 24747d01e..3b1257311 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": 44,
+	"version": 45,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 44
+			"version": 45
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index 979d39fc4..4cedf19a6 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -409,25 +409,64 @@
             ]
         },
         {
-            "name": "Vaughn Live / iNSTAGIB.tv",
+            "name": "Vaughn Live / iNSTAGIB",
             "servers": [
                 {
                     "name": "US: Primary",
-                    "url": "rtmp://live.vaughnsoft.net:443/live"
+                    "url": "rtmp://live.vaughnsoft.net/live"
                 },
                 {
-                    "name": "US: San Jose, CA",
-                    "url": "rtmp://live-sjc.vaughnsoft.net:443/live"
+                    "name": "US: Chicago, IL",
+                    "url": "rtmp://live-ord.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Denver, CO",
+                    "url": "rtmp://live-den.vaughnsoft.net/live"
                 },
                 {
-                    "name": "US: New York, NY",
-                    "url": "rtmp://live-nyc.vaughnsoft.net:443/live"
+                    "name": "US: Los Angeles, CA",
+                    "url": "rtmp://live-lax.vaughnsoft.net/live"
                 },
                 {
-                    "name": "US: New York 2, NY",
-                    "url": "rtmp://live-nyc2.vaughnsoft.net:443/live"
+                    "name": "EU: Amsterdam, NL",
+                    "url": "rtmp://live-ams.vaughnsoft.net/live"
                 }
-            ]
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 3500,
+                "max audio bitrate": 160
+            }
+        },
+        {
+            "name": "Breakers.TV",
+            "servers": [
+                {
+                    "name": "US: Primary",
+                    "url": "rtmp://live.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Chicago, IL",
+                    "url": "rtmp://live-ord.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Denver, CO",
+                    "url": "rtmp://live-den.vaughnsoft.net/live"
+                },
+                {
+                    "name": "US: Los Angeles, CA",
+                    "url": "rtmp://live-lax.vaughnsoft.net/live"
+                },
+                {
+                    "name": "EU: Amsterdam, NL",
+                    "url": "rtmp://live-ams.vaughnsoft.net/live"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 3500,
+                "max audio bitrate": 160
+            }
         },
         {
             "name": "connectcast.tv",
-- 
GitLab