projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1c924a
)
[YoutubeDL] Fix PEP8 W503
author
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 13 May 2015 13:16:45 +0000
(21:16 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Wed, 13 May 2015 13:16:45 +0000
(21:16 +0800)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 4cf83c510496f805da8174707d6b3f37d0aed146..84d50dab7646537f3707f550e43b4b9ea2ca7ddd 100755
(executable)
--- 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 = []
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)
req_format_list.append('bestvideo+bestaudio')
req_format_list.append('best')
req_format = '/'.join(req_format_list)