From: remitamine Date: Sat, 6 Feb 2016 13:51:45 +0000 (+0100) Subject: [generic] detect MPD manfiest only from the content X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=28ad7df65ddb78c16ac008886d14ae2914aea6be;p=youtube-dl [generic] detect MPD manfiest only from the content --- 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'),