diff options
| author | dinesh <dsdiscoverdinesh@gmail.com> | 2014-10-24 09:47:39 +0530 |
|---|---|---|
| committer | dinesh <dsdiscoverdinesh@gmail.com> | 2014-10-24 09:47:39 +0530 |
| commit | 7a47d07c6dbc8b6bb3be321af886c1774d68e0d6 (patch) | |
| tree | d202efa18c5a70b68a04e1224ec6cc621525602f | |
| parent | 34e48bed3b562ef32c3bfa14ba59101786316464 (diff) | |
| download | youtube-dl-7a47d07c6dbc8b6bb3be321af886c1774d68e0d6.tar.gz youtube-dl-7a47d07c6dbc8b6bb3be321af886c1774d68e0d6.tar.xz youtube-dl-7a47d07c6dbc8b6bb3be321af886c1774d68e0d6.zip | |
[extractor/common] href attribute added
| -rw-r--r-- | youtube_dl/extractor/common.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 290df1175..a8674dd85 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -647,10 +647,14 @@ class InfoExtractor(object): 'Unable to download f4m manifest') formats = [] + manifest_version = '1.0' media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media') if not media_nodes: + manifest_version = '2.0' 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') tbr = int_or_none(media_el.attrib.get('bitrate')) format_id = 'f4m-%d' % (i if tbr is None else tbr) formats.append({ |