diff options
| author | remitamine <remitamine@gmail.com> | 2016-02-06 14:51:45 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-02-06 14:51:45 +0100 |
| commit | 28ad7df65ddb78c16ac008886d14ae2914aea6be (patch) | |
| tree | 4260f610d120e3887dc6cc91ad8445bbdc78084e /youtube_dl | |
| parent | 79a350857911d21bb04c90b2db04d7f6f0a3676b (diff) | |
[generic] detect MPD manfiest only from the content
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 4 |
1 files changed, 1 insertions, 3 deletions
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'^(?P<type>audio|video|application(?=/(?:ogg$|dash\+xml|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>.+)$', content_type) + m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>.+)$', 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'), |