diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-02-06 04:29:29 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-02-06 04:29:29 +0600 |
| commit | 3900eec27c0a385d60f2b1dca50faa6f5e25b971 (patch) | |
| tree | d512ec1560cb5c802c3334030c7c6443060236e5 | |
| parent | a02d212638548fc4ec71174900b3ec9f420e3af6 (diff) | |
| download | youtube-dl-3900eec27c0a385d60f2b1dca50faa6f5e25b971.tar.gz youtube-dl-3900eec27c0a385d60f2b1dca50faa6f5e25b971.tar.xz youtube-dl-3900eec27c0a385d60f2b1dca50faa6f5e25b971.zip | |
[extractor/common] Fix 2.0 manifest extraction (Closes #4830)
| -rw-r--r-- | youtube_dl/extractor/common.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 8ec7cee06..df1a4417b 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -778,7 +778,8 @@ class InfoExtractor(object): media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media') for i, media_el in enumerate(media_nodes): if manifest_version == '2.0': - manifest_url = '/'.join(manifest_url.split('/')[:-1]) + '/' + media_el.attrib.get('href') + manifest_url = ('/'.join(manifest_url.split('/')[:-1]) + '/' + + (media_el.attrib.get('href') or media_el.attrib.get('url'))) tbr = int_or_none(media_el.attrib.get('bitrate')) formats.append({ 'format_id': '-'.join(filter(None, [f4m_id, 'f4m-%d' % (i if tbr is None else tbr)])), |