projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e36370
)
[msn] Fix formats extraction
author
Sergey M․
<dstftw@gmail.com>
Sun, 11 Jun 2017 01:56:53 +0000
(08:56 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 11 Jun 2017 01:56:53 +0000
(08:56 +0700)
youtube_dl/extractor/msn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/msn.py
b/youtube_dl/extractor/msn.py
index 1473bcf4845d4b8470393686a7bd9baf1df0e398..650731fdc3617fd8b9680ee97e40b8dfefc7c4e4 100644
(file)
--- a/
youtube_dl/extractor/msn.py
+++ b/
youtube_dl/extractor/msn.py
@@
-68,10
+68,6
@@
class MSNIE(InfoExtractor):
format_url = file_.get('url')
if not format_url:
continue
format_url = file_.get('url')
if not format_url:
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:
# m3u8_native should not be used here until
# https://github.com/rg3/youtube-dl/issues/9913 is fixed
if 'm3u8' in format_url:
# m3u8_native should not be used here until
# https://github.com/rg3/youtube-dl/issues/9913 is fixed
@@
-79,6
+75,9
@@
class MSNIE(InfoExtractor):
format_url, display_id, 'mp4',
m3u8_id='hls', fatal=False)
formats.extend(m3u8_formats)
format_url, display_id, 'mp4',
m3u8_id='hls', fatal=False)
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:
formats.append({
'url': format_url,
else:
formats.append({
'url': format_url,