X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fgeneric.py;h=bf61ab2e7c3522054caaeb6bc5dd6b1c4897ffe8;hb=59b35c674597b913454b3efc82d60f903fb83fcb;hp=6de777c41e8a4e602e22b233af9c8d231875b749;hpb=79a350857911d21bb04c90b2db04d7f6f0a3676b;p=youtube-dl diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 6de777c41..bf61ab2e7 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -1229,15 +1229,13 @@ class GenericIE(InfoExtractor): # Check for direct link to a video content_type = head_response.headers.get('Content-Type', '') - m = re.match(r'^(?Paudio|video|application(?=/(?:ogg$|dash\+xml|(?:vnd\.apple\.|x-)?mpegurl)))/(?P.+)$', content_type) + m = re.match(r'^(?Paudio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P.+)$', content_type) if m: upload_date = unified_strdate( head_response.headers.get('Last-Modified')) formats = [] if m.group('format_id').endswith('mpegurl'): formats = self._extract_m3u8_formats(url, video_id, 'mp4') - elif m.group('format_id').startswith('dash+xml'): - formats = self._extract_mpd_formats(url, video_id) else: formats = [{ 'format_id': m.group('format_id'),