From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 15 Jul 2015 19:14:52 +0000 (+0600)
Subject: [extractor/common] Properly handle full URLs
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=cc357c4db8112ff6736a227b47fb9527d327797f;p=youtube-dl.git

[extractor/common] Properly handle full URLs
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index f8a5ecced..78e5cf8d0 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -851,8 +851,10 @@ 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') or media_el.attrib.get('url')))
+                media_url = media_el.attrib.get('href') or media_el.attrib['url']
+                manifest_url = (
+                    media_url if media_url.startswith('http://') or media_url.startswith('https://')
+                    else ('/'.join(manifest_url.split('/')[:-1]) + '/' + media_url))
             tbr = int_or_none(media_el.attrib.get('bitrate'))
             formats.append({
                 'format_id': '-'.join(filter(None, [f4m_id, compat_str(i if tbr is None else tbr)])),