aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorSergey M․ <[email protected]>2017-04-25 22:07:10 +0700
committerSergey M․ <[email protected]>2017-04-27 21:53:17 +0700
commitff99fe529e52b2465f1d973e69df01a6391568d6 (patch)
treeefbe250684068fdd6fdcb129d0fdc4fb7031fb4e /youtube_dl/extractor/common.py
parente8bfe2a946eda74f16af8734c35fba8c223e41fa (diff)
downloadyoutube-dl-ff99fe529e52b2465f1d973e69df01a6391568d6.tar.gz
youtube-dl-ff99fe529e52b2465f1d973e69df01a6391568d6.zip
Don't list master m3u8 playlists in format list (closes #12832)
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 8b3f04c61..6d01f0800 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -1334,7 +1334,7 @@ class InfoExtractor(object):
if '#EXT-X-FAXS-CM:' in m3u8_doc: # Adobe Flash Access
return []
- formats = [self._m3u8_meta_format(m3u8_url, ext, preference, m3u8_id)]
+ formats = []
format_url = lambda u: (
u
@@ -1438,7 +1438,7 @@ class InfoExtractor(object):
f = {
'format_id': '-'.join(format_id),
'url': manifest_url,
- 'manifest_url': manifest_url,
+ 'manifest_url': m3u8_url,
'tbr': tbr,
'ext': ext,
'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),