From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Thu, 23 Jul 2015 10:09:30 +0000 (+0200)
Subject: [downloader/dash] Improve 'combine_url' (fixes #6341)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=59db9f80187c4dc3768f8656ede281347a805e1d;p=youtube-dl

[downloader/dash] Improve 'combine_url' (fixes #6341)

In some videos the base_url already ends with '/'.
---

diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py
index a4685d307..8b6fa2753 100644
--- 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
-            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(