|
|
@ -68,10 +68,6 @@ class MSNIE(InfoExtractor):
|
|
|
|
format_url = file_.get('url')
|
|
|
|
format_url = file_.get('url')
|
|
|
|
if not format_url:
|
|
|
|
if not format_url:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
ext = determine_ext(format_url)
|
|
|
|
|
|
|
|
if ext == 'ism':
|
|
|
|
|
|
|
|
formats.extend(self._extract_ism_formats(
|
|
|
|
|
|
|
|
format_url + '/Manifest', display_id, 'mss', fatal=False))
|
|
|
|
|
|
|
|
if 'm3u8' in format_url:
|
|
|
|
if 'm3u8' in format_url:
|
|
|
|
# m3u8_native should not be used here until
|
|
|
|
# m3u8_native should not be used here until
|
|
|
|
# https://github.com/rg3/youtube-dl/issues/9913 is fixed
|
|
|
|
# https://github.com/rg3/youtube-dl/issues/9913 is fixed
|
|
|
@ -79,6 +75,9 @@ class MSNIE(InfoExtractor):
|
|
|
|
format_url, display_id, 'mp4',
|
|
|
|
format_url, display_id, 'mp4',
|
|
|
|
m3u8_id='hls', fatal=False)
|
|
|
|
m3u8_id='hls', fatal=False)
|
|
|
|
formats.extend(m3u8_formats)
|
|
|
|
formats.extend(m3u8_formats)
|
|
|
|
|
|
|
|
elif determine_ext(format_url) == 'ism':
|
|
|
|
|
|
|
|
formats.extend(self._extract_ism_formats(
|
|
|
|
|
|
|
|
format_url + '/Manifest', display_id, 'mss', fatal=False))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
formats.append({
|
|
|
|
formats.append({
|
|
|
|
'url': format_url,
|
|
|
|
'url': format_url,
|
|
|
|