1
0
mirror of https://gitlab.com/ytdl-org/youtube-dl.git synced 2026-04-05 00:00:03 -04:00

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/downloader/external.py
This commit is contained in:
Philipp Hagemeister
2015-02-02 20:32:07 +01:00
+2 -2
View File
@@ -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