Merge tag 'upstream/2015.11.10'

[youtubedl] / youtube_dl / downloader / dash.py

diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py
index a4685d307fa3b0cc1357f08c4a1398b7f251c3fe..8b6fa2753adbafcb1a0ab26788dcec2be5903638 100644 (file)
--- a/youtube_dl/downloader/dash.py
+++ b/youtube_dl/downloader/dash.py
@@ -37,7 +37,7 @@ class DashSegmentsFD(FileDownloader):
         def combine_url(base_url, target_url):
             if re.match(r'^https?://', target_url):
                 return target_url
         def combine_url(base_url, target_url):
             if re.match(r'^https?://', target_url):
                 return target_url

-            return '%s/%s' % (base_url, target_url)
+            return '%s%s%s' % (base_url, '' if base_url.endswith('/') else '/', target_url)

 
         with open(tmpfilename, 'wb') as outf:
             append_url_to_file(
 
         with open(tmpfilename, 'wb') as outf:
             append_url_to_file(