dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 9fffd0469f ae7773942e
commit ea71034bd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/downloader/external.py
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