Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/downloader/external.py

diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py
index e47e3bf4c7df58f4e8a74c8c42263799c2b3208e..faac11805cafb0adb2c0a6609cf195ab92783eef 100644 (file)
--- 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