Merge branch 'pr-twitter' of https://github.com/atomicdryad/youtube-dl into atomicdry...

[youtube-dl] / youtube_dl / extractor / kaltura.py

diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py
index c57f33ece2fd6aa0df1cb7c494e1a3bf44e475da..3dca0e566f886888987bfb68360b9a0a51b04575 100644 (file)
--- a/youtube_dl/extractor/kaltura.py
+++ b/youtube_dl/extractor/kaltura.py
@@ -16,20 +16,19 @@ class KalturaIE(InfoExtractor):
                 (?:
                     kaltura:(?P<partner_id_s>\d+):(?P<id_s>[0-9a-z_]+)|
                     https?://
-                    (:?
-                        (?:www|cdnapisec)\.)?kaltura\.com/
+                        (:?(?:www|cdnapisec)\.)?kaltura\.com/
                         (?:
                             (?:
                                 # flash player
                                 index\.php/kwidget/
                                 (?:[^/]+/)*?wid/_(?P<partner_id>\d+)/
                                 (?:[^/]+/)*?entry_id/(?P<id>[0-9a-z_]+)|
-                                # html player
+                                # html5 player
                                 html5/html5lib/
                                 (?:[^/]+/)*?entry_id/(?P<id_html5>[0-9a-z_]+)
                                 .*\?.*\bwid=_(?P<partner_id_html5>\d+)
+                            )
                         )
-                    )
                 )
                 '''
     _API_BASE = 'http://cdnapi.kaltura.com/api_v3/index.php?'