From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Tue, 22 Jul 2008 09:00:38 +0000 (+0200)
Subject: Fix not taking into account outs.outtmpl
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=e8e20c76f23e73c8f4f864667b03515ab5d7523f;p=youtube-dl

Fix not taking into account outs.outtmpl
---

diff --git a/youtube-dl b/youtube-dl
index 7d3758654..814e1b68b 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -519,7 +519,8 @@ if __name__ == '__main__':
 			'forcetitle': opts.gettitle,
 			'simulate': (opts.simulate or opts.geturl or opts.gettitle),
 			'format': opts.format,
-			'outtmpl': ((opts.usetitle and '%(stitle)s-%(id)s.%(ext)s')
+			'outtmpl': ((opts.outtmpl is not None and opts.outtmpl)
+				or (opts.usetitle and '%(stitle)s-%(id)s.%(ext)s')
 				or (opts.useliteral and '%(title)s-%(id)s.%(ext)s')
 				or '%(id)s.%(ext)s'),
 			})