]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[generic] extract dash formats detected using content type
authorremitamine <remitamine@gmail.com>
Sat, 6 Feb 2016 05:47:38 +0000 (06:47 +0100)
committerremitamine <remitamine@gmail.com>
Sat, 6 Feb 2016 05:47:38 +0000 (06:47 +0100)
youtube_dl/extractor/generic.py

index c02fe201c7aa9205e75c74f0d5745d4f4cb210b3..4c2c76dc57d9ec52547e0601fc16d45bb4db7e08 100644 (file)
@@ -1229,13 +1229,15 @@ 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$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>.+)$', content_type)
+        m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|dash\+xml|(?: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'),