]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] Improve base url construction
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Feb 2016 18:13:56 +0000 (00:13 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Feb 2016 18:13:56 +0000 (00:13 +0600)
youtube_dl/extractor/common.py

index 359bdd299a508181e23688f87dfb6b8f11b8164d..444d412d9cfa8800ffb54fbd68f30603b0c9e247 100644 (file)
@@ -1435,7 +1435,9 @@ class InfoExtractor(object):
                                 base_url = base_url_e.text + base_url
                                 if re.match(r'^https?://', base_url):
                                     break
-                        if not re.match(r'^https?://', base_url):
+                        if mpd_base_url and not re.match(r'^https?://', base_url):
+                            if not mpd_base_url.endswith('/') and not base_url.startswith('/'):
+                                mpd_base_url += '/'
                             base_url = mpd_base_url + base_url
                         representation_id = representation_attrib.get('id')
                         lang = representation_attrib.get('lang')