X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fkaltura.py;h=3dca0e566f886888987bfb68360b9a0a51b04575;hb=30eecc6a044d4070d0e8ea4a6e0637867f0d3a28;hp=c57f33ece2fd6aa0df1cb7c494e1a3bf44e475da;hpb=ee3ec091f46bd52979274d0aa42ff1f1c3344de6;p=youtube-dl diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dl/extractor/kaltura.py index c57f33ece..3dca0e566 100644 --- a/youtube_dl/extractor/kaltura.py +++ b/youtube_dl/extractor/kaltura.py @@ -16,20 +16,19 @@ class KalturaIE(InfoExtractor): (?: kaltura:(?P\d+):(?P[0-9a-z_]+)| https?:// - (:? - (?:www|cdnapisec)\.)?kaltura\.com/ + (:?(?:www|cdnapisec)\.)?kaltura\.com/ (?: (?: # flash player index\.php/kwidget/ (?:[^/]+/)*?wid/_(?P\d+)/ (?:[^/]+/)*?entry_id/(?P[0-9a-z_]+)| - # html player + # html5 player html5/html5lib/ (?:[^/]+/)*?entry_id/(?P[0-9a-z_]+) .*\?.*\bwid=_(?P\d+) + ) ) - ) ) ''' _API_BASE = 'http://cdnapi.kaltura.com/api_v3/index.php?'