youtube-dl

commit ea71034bd3965de8ff7239516776296e2c9857c3
parent 9fffd0469f1353c5f5e96b91a87e34d02ae7491a
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon,  2 Feb 2015 20:32:07 +0100

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/downloader/external.py

Diffstat:
M
youtube_dl/downloader/external.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py
@@ -47,8 +47,8 @@ class ExternalFD(FileDownloader):
 
     def _source_address(self, command_option):
         command_part = []
-        source_address = self.ydl.params.get('source_address')
-        if source_address is None:
+        source_address = self.params.get('source_address')
+        if source_address:
             command_part = [command_option, source_address]
         return command_part