youtube-dl

commit bfa1073e113cb7fa8a362112d4eae6dede197efa
parent e029c43bd43ddde448b150b1e0f226e4dd8c9b90
Author: Remita Amine <remitamine@gmail.com>
Date:   Tue, 20 Dec 2016 19:49:45 +0100

[uplynk] force downloading using hls native downloader(closes #11496)

Diffstat:
M
youtube_dl/downloader/hls.py
 | 
3
+++
M
youtube_dl/extractor/uplynk.py
 | 
4
+++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
@@ -65,6 +65,9 @@ class HlsFD(FragmentFD):
         s = manifest.decode('utf-8', 'ignore')
 
         if not self.can_download(s, info_dict):
+            if info_dict.get('extra_param_to_segment_url'):
+                self.report_error('pycrypto not found. Please install it.')
+                return False
             self.report_warning(
                 'hlsnative has detected features it does not support, '
                 'extraction will be delegated to ffmpeg')
diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py
@@ -30,7 +30,9 @@ class UplynkIE(InfoExtractor):
     def _extract_uplynk_info(self, uplynk_content_url):
         path, external_id, video_id, session_id = re.match(UplynkIE._VALID_URL, uplynk_content_url).groups()
         display_id = video_id or external_id
-        formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4')
+        formats = self._extract_m3u8_formats(
+            'http://content.uplynk.com/%s.m3u8' % path,
+            display_id, 'mp4', 'm3u8_native')
         if session_id:
             for f in formats:
                 f['extra_param_to_segment_url'] = 'pbs=' + session_id