diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 17:51:52 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 17:51:52 +0100 |
| commit | 121c09c7be1ac2944f3432122104c1952bfd1f04 (patch) | |
| tree | 7b96e405abc87407a71664cdbc0027def6b959b2 /youtube_dl/extractor/common.py | |
| parent | 76bfaf6daf73ac74f7a9068c51d14ab0a5ec5e52 (diff) | |
| parent | 0551a02b82b4209422e0734150e0186210cd0723 (diff) | |
| download | youtube-dl-121c09c7be1ac2944f3432122104c1952bfd1f04.tar.xz | |
Merge remote-tracking branch 'Dineshs91/f4m-2.0'
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 363e2000c..03f3f18c8 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -742,8 +742,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({ |