X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fkonserthusetplay.py;h=55291c66ff066733a8610abe5acc65b1e0daf7f3;hb=25291b979a7ff8dc7ab57729a724e7e372c65c4b;hp=f21d050d76c6bc08aa9fd8951ef7092e35b97c0c;hpb=5a7699bb2ef77c2548bcc2112e042481a809ba35;p=youtube-dl

diff --git a/youtube_dl/extractor/konserthusetplay.py b/youtube_dl/extractor/konserthusetplay.py
index f21d050d7..55291c66f 100644
--- a/youtube_dl/extractor/konserthusetplay.py
+++ b/youtube_dl/extractor/konserthusetplay.py
@@ -9,7 +9,7 @@ from ..utils import (
 
 
 class KonserthusetPlayIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?konserthusetplay\.se/\?m=(?P<id>[^&]+)'
+    _VALID_URL = r'https?://(?:www\.)?konserthusetplay\.se/\?.*\bm=(?P<id>[^&]+)'
     _TEST = {
         'url': 'http://www.konserthusetplay.se/?m=CKDDnlCY-dhWAAqiMERd-A',
         'info_dict': {
@@ -44,10 +44,6 @@ class KonserthusetPlayIE(InfoExtractor):
 
         source = next(f for f in playlist if f.get('bitrates'))
 
-        connection_url = (player_config.get('rtmp', {}).get(
-            'netConnectionUrl') or player_config.get(
-            'plugins', {}).get('bwcheck', {}).get('netConnectionUrl'))
-
         FORMAT_ID_REGEX = r'_([^_]+)_h264m\.mp4'
 
         formats = []
@@ -58,6 +54,9 @@ class KonserthusetPlayIE(InfoExtractor):
             fallback_format_id = self._search_regex(
                 FORMAT_ID_REGEX, fallback_url, 'format id', default=None)
 
+        connection_url = (player_config.get('rtmp', {}).get(
+            'netConnectionUrl') or player_config.get(
+            'plugins', {}).get('bwcheck', {}).get('netConnectionUrl'))
         if connection_url:
             for f in source['bitrates']:
                 video_url = f.get('url')