From 9b0eaa020739a80d838b578eeb7c6c349859c209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 26 Jun 2019 15:27:36 +0200
Subject: [PATCH 1/2] [mixer:vod] relax _VALID_URL (fixes #21531)

---
 youtube_dl/extractor/beampro.py | 44 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/youtube_dl/extractor/beampro.py b/youtube_dl/extractor/beampro.py
index 2eaec1ab4..5faee43d4 100644
--- a/youtube_dl/extractor/beampro.py
+++ b/youtube_dl/extractor/beampro.py
@@ -99,27 +99,33 @@ class BeamProLiveIE(BeamProBaseIE):
 
 class BeamProVodIE(BeamProBaseIE):
     IE_NAME = 'Mixer:vod'
-    _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/[^/?#&]+\?.*?\bvod=(?P<id>\d+)'
-    _TEST = {
-        'url': 'https://mixer.com/willow8714?vod=2259830',
-        'md5': 'b2431e6e8347dc92ebafb565d368b76b',
-        'info_dict': {
-            'id': '2259830',
-            'ext': 'mp4',
-            'title': 'willow8714\'s Channel',
-            'duration': 6828.15,
-            'thumbnail': r're:https://.*source\.png$',
-            'timestamp': 1494046474,
-            'upload_date': '20170506',
-            'uploader': 'willow8714',
-            'uploader_id': '6085379',
-            'age_limit': 13,
-            'view_count': int,
+    _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/[^/?#&]+\?.*?\bvod=(?P<id>\w+)'
+    _TESTS = [
+        {
+            'url': 'https://mixer.com/willow8714?vod=2259830',
+            'md5': 'b2431e6e8347dc92ebafb565d368b76b',
+            'info_dict': {
+                'id': '2259830',
+                'ext': 'mp4',
+                'title': 'willow8714\'s Channel',
+                'duration': 6828.15,
+                'thumbnail': r're:https://.*source\.png$',
+                'timestamp': 1494046474,
+                'upload_date': '20170506',
+                'uploader': 'willow8714',
+                'uploader_id': '6085379',
+                'age_limit': 13,
+                'view_count': int,
+            },
+            'params': {
+                'skip_download': True,
+            },
         },
-        'params': {
-            'skip_download': True,
+        {
+            'url': 'https://mixer.com/streamer?vod=IxFno1rqC0S_XJ1a2yGgNw',
+            'only_matching': True,
         },
-    }
+    ]
 
     @staticmethod
     def _extract_format(vod, vod_type):

From 8cfa84ada42298d2f027d472091ba9b3546234fc Mon Sep 17 00:00:00 2001
From: Sergey M <dstftw@gmail.com>
Date: Thu, 27 Jun 2019 22:24:00 +0700
Subject: [PATCH 2/2] Update beampro.py

---
 youtube_dl/extractor/beampro.py | 45 +++++++++++++++------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/youtube_dl/extractor/beampro.py b/youtube_dl/extractor/beampro.py
index 5faee43d4..e264a145f 100644
--- a/youtube_dl/extractor/beampro.py
+++ b/youtube_dl/extractor/beampro.py
@@ -100,32 +100,29 @@ class BeamProLiveIE(BeamProBaseIE):
 class BeamProVodIE(BeamProBaseIE):
     IE_NAME = 'Mixer:vod'
     _VALID_URL = r'https?://(?:\w+\.)?(?:beam\.pro|mixer\.com)/[^/?#&]+\?.*?\bvod=(?P<id>\w+)'
-    _TESTS = [
-        {
-            'url': 'https://mixer.com/willow8714?vod=2259830',
-            'md5': 'b2431e6e8347dc92ebafb565d368b76b',
-            'info_dict': {
-                'id': '2259830',
-                'ext': 'mp4',
-                'title': 'willow8714\'s Channel',
-                'duration': 6828.15,
-                'thumbnail': r're:https://.*source\.png$',
-                'timestamp': 1494046474,
-                'upload_date': '20170506',
-                'uploader': 'willow8714',
-                'uploader_id': '6085379',
-                'age_limit': 13,
-                'view_count': int,
-            },
-            'params': {
-                'skip_download': True,
-            },
+    _TESTS = [{
+        'url': 'https://mixer.com/willow8714?vod=2259830',
+        'md5': 'b2431e6e8347dc92ebafb565d368b76b',
+        'info_dict': {
+            'id': '2259830',
+            'ext': 'mp4',
+            'title': 'willow8714\'s Channel',
+            'duration': 6828.15,
+            'thumbnail': r're:https://.*source\.png$',
+            'timestamp': 1494046474,
+            'upload_date': '20170506',
+            'uploader': 'willow8714',
+            'uploader_id': '6085379',
+            'age_limit': 13,
+            'view_count': int,
         },
-        {
-            'url': 'https://mixer.com/streamer?vod=IxFno1rqC0S_XJ1a2yGgNw',
-            'only_matching': True,
+        'params': {
+            'skip_download': True,
         },
-    ]
+    }, {
+        'url': 'https://mixer.com/streamer?vod=IxFno1rqC0S_XJ1a2yGgNw',
+        'only_matching': True,
+    }]
 
     @staticmethod
     def _extract_format(vod, vod_type):