about summary refs log tree commit diff
path: root/youtube_dl/extractor/threeqsdn.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-07-06 09:11:46 +0100
committerRemita Amine <remitamine@gmail.com>2016-07-06 09:11:46 +0100
commitab49d7a9fae08763de549f85ba138b22f9122a99 (patch)
treed4a2c796088234b9553db074ccbd5ae1752a540c /youtube_dl/extractor/threeqsdn.py
parentb4173f1551c47f64745cb91451c46891e2aaac16 (diff)
downloadyoutube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.tar.gz
youtube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.tar.xz
youtube-dl-ab49d7a9fae08763de549f85ba138b22f9122a99.zip
use mimetype2ext to determine manifest ext in multiple extractors
Diffstat (limited to 'youtube_dl/extractor/threeqsdn.py')
-rw-r--r--youtube_dl/extractor/threeqsdn.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dl/extractor/threeqsdn.py
index c77a07989..a0bc12c81 100644
--- a/youtube_dl/extractor/threeqsdn.py
+++ b/youtube_dl/extractor/threeqsdn.py
@@ -92,12 +92,11 @@ class ThreeQSDNIE(InfoExtractor):
             if not item_url or item_url in urls:
                 return
             urls.add(item_url)
-            type_ = item.get('type')
-            ext = determine_ext(item_url, default_ext=None)
-            if type_ == 'application/dash+xml' or ext == 'mpd':
+            ext = mimetype2ext(item.get('type')) or determine_ext(item_url, default_ext=None)
+            if ext == 'mpd':
                 formats.extend(self._extract_mpd_formats(
                     item_url, video_id, mpd_id='mpd', fatal=False))
-            elif type_ in ('application/vnd.apple.mpegURL', 'application/x-mpegurl') or ext == 'm3u8':
+            elif ext == 'm3u8':
                 formats.extend(self._extract_m3u8_formats(
                     item_url, video_id, 'mp4',
                     entry_protocol='m3u8' if live else 'm3u8_native',
@@ -111,7 +110,7 @@ class ThreeQSDNIE(InfoExtractor):
                 formats.append({
                     'url': item_url,
                     'format_id': item.get('quality'),
-                    'ext': 'mp4' if item_url.startswith('rtsp') else mimetype2ext(type_) or ext,
+                    'ext': 'mp4' if item_url.startswith('rtsp') else ext,
                     'vcodec': 'none' if stream_type == 'audio' else None,
                 })