aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/YoutubeDL.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2015-05-13 21:16:45 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2015-05-13 21:16:45 +0800
commit3749e36e9f0e6be2a3a3ab1b15c0c02be5a50e2f (patch)
tree605ca1f4aca8afa8cbda712cf83442812d648aa1 /youtube_dl/YoutubeDL.py
parentc1c924abfeda45f29b991bb74f315f0e79dcf126 (diff)
downloadyoutube-dl-3749e36e9f0e6be2a3a3ab1b15c0c02be5a50e2f.tar.xz
[YoutubeDL] Fix PEP8 W503
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rwxr-xr-xyoutube_dl/YoutubeDL.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 4cf83c510..84d50dab7 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1085,9 +1085,9 @@ class YoutubeDL(object):
req_format = self.params.get('format')
if req_format is None:
req_format_list = []
- if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
- and info_dict['extractor'] in ['youtube', 'ted']
- and FFmpegMergerPP(self).available):
+ if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-' and
+ info_dict['extractor'] in ['youtube', 'ted'] and
+ FFmpegMergerPP(self).available):
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best')
req_format = '/'.join(req_format_list)