projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure URLs are always character strings (Fixes #2051)
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 3786799da7967ca8522462758ee81318f1e06214..5748ceaf394f5eb0aa1f662da11da5d3dcd81a1c 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-702,7
+702,7
@@
class YoutubeDL(object):
if req_format in ('-1', 'all'):
formats_to_download = formats
else:
if req_format in ('-1', 'all'):
formats_to_download = formats
else:
- # We can accept formats requestd in the format: 34/5/best, we pick
+ # We can accept formats request
e
d in the format: 34/5/best, we pick
# the first that is available, starting from left
req_formats = req_format.split('/')
for rf in req_formats:
# the first that is available, starting from left
req_formats = req_format.split('/')
for rf in req_formats:
@@
-712,7
+712,11
@@
class YoutubeDL(object):
formats_info = (self.select_format(format_1, formats),
self.select_format(format_2, formats))
if all(formats_info):
formats_info = (self.select_format(format_1, formats),
self.select_format(format_2, formats))
if all(formats_info):
- selected_format = {'requested_formats': formats_info}
+ selected_format = {
+ 'requested_formats': formats_info,
+ 'format': rf,
+ 'ext': formats_info[0]['ext'],
+ }
else:
selected_format = None
else:
else:
selected_format = None
else: