From 562b3c2990d53e94559cb78a14915083c6d192b2 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Tue, 30 Aug 2016 18:23:49 -0700
Subject: [PATCH] rtmp-services: Add meridex service

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

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index 4301f4c79..4365199ed 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": 32,
+	"version": 33,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 32
+			"version": 33
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index a4481f065..e8bb48a01 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -697,6 +697,18 @@
             "recommended": {
                 "max video bitrate": 1500
             }
+        },
+        {
+            "name": "Meridix Live Sports Platform",
+            "servers": [
+                {
+                    "name": "Primary",
+                    "url": "rtmp://publish.meridix.com/live"
+                }
+            ],
+            "recommended": {
+                "max video bitrate": 3500
+            }
         }
     ]
 }
-- 
GitLab