aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-02 20:32:07 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-02 20:32:07 +0100
commitea71034bd3965de8ff7239516776296e2c9857c3 (patch)
treebd4a637859aeb49ffabe19c798b07ccaab677ee1 /youtube_dl
parent9fffd0469f1353c5f5e96b91a87e34d02ae7491a (diff)
parentae7773942ecf816e9592e55bdef7234f41c89c85 (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: youtube_dl/downloader/external.py
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/downloader/external.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py
index e47e3bf4c..faac11805 100644
--- 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