projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube...
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 00f86b342dfd6bbf14c609353d3c4493719db738..4c8196d082fa9cfffbb45a1c5f5684664ecc1a80 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-1085,8
+1085,8
@@
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']):
+ if (self.params.get('outtmpl', DEFAULT_OUTTMPL) != '-'
and
+ info_dict['extractor'] in ['youtube', 'ted']):
merger = FFmpegMergerPP(self)
if merger.available and merger.can_merge():
req_format_list.append('bestvideo+bestaudio')
merger = FFmpegMergerPP(self)
if merger.available and merger.can_merge():
req_format_list.append('bestvideo+bestaudio')