X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2FYoutubeDL.py;h=e2332f9b84ef2c41d6cf986553d4f999bac946a6;hb=7853cc5ae1f9068f3bdf59ce959cb70645b9bc20;hp=f9a6da520380476b70e89fb602a0278ffa8dd544;hpb=b028e96144a2bf1ba84dd6d11f1cc13a2928c438;p=youtube-dl

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index f9a6da520..e2332f9b8 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -278,10 +278,12 @@ class YoutubeDL(object):
             sanitize = lambda k, v: sanitize_filename(
                 u'NA' if v is None else compat_str(v),
                 restricted=self.params.get('restrictfilenames'),
-                is_id=k == u'id')
-            template_dict = dict((k, sanitize(k, v)) for k, v in template_dict.items())
+                is_id=(k == u'id'))
+            template_dict = dict((k, sanitize(k, v))
+                                 for k, v in template_dict.items())
 
-            filename = self.params['outtmpl'] % template_dict
+            tmpl = os.path.expanduser(self.params['outtmpl'])
+            filename = tmpl % template_dict
             return filename
         except KeyError as err:
             self.report_error(u'Erroneous output template')