[brightcove] Make _VALID_URL less greedy and check for empty URLs (#3541)
authorNaglis Jonaitis <njonaitis@gmail.com>
Mon, 3 Nov 2014 21:12:24 +0000 (23:12 +0200)
committerNaglis Jonaitis <njonaitis@gmail.com>
Mon, 3 Nov 2014 21:12:24 +0000 (23:12 +0200)
youtube_dl/extractor/brightcove.py

index ad22cbafd6a541599c289cfd7dcb1b27ec7a8e95..cc94e596c06d870ca322e11325d87c1e34fee530 100644 (file)
@@ -23,7 +23,7 @@ from ..utils import (
 
 
 class BrightcoveIE(InfoExtractor):
-    _VALID_URL = r'https?://.*brightcove\.com/(services|viewer).*\?(?P<query>.*)'
+    _VALID_URL = r'https?://.*brightcove\.com/(services|viewer).*?\?(?P<query>.*)'
     _FEDERATED_URL_TEMPLATE = 'http://c.brightcove.com/services/viewer/htmlFederated?%s'
 
     _TESTS = [
@@ -260,6 +260,8 @@ class BrightcoveIE(InfoExtractor):
             formats = []
             for rend in renditions:
                 url = rend['defaultURL']
+                if not url:
+                    continue
                 if rend['remote']:
                     # This type of renditions are served through akamaihd.net,
                     # but they don't use f4m manifests