From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 5 Feb 2015 22:29:29 +0000 (+0600)
Subject: [extractor/common] Fix 2.0 manifest extraction (Closes #4830)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3900eec27c0a385d60f2b1dca50faa6f5e25b971;p=youtube-dl

[extractor/common] Fix 2.0 manifest extraction (Closes #4830)
---

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)])),