From: dinesh Date: Fri, 24 Oct 2014 04:17:39 +0000 (+0530) Subject: [extractor/common] href attribute added X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7a47d07c6dbc8b6bb3be321af886c1774d68e0d6;p=youtube-dl [extractor/common] href attribute added --- 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({