projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f13b88c
)
[YoutubeDL] Fix video+audio format field (Closes #4880)
author
Sergey M․
<dstftw@gmail.com>
Thu, 5 Feb 2015 18:51:16 +0000
(
00:51
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 5 Feb 2015 18:51:16 +0000
(
00:51
+0600)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 1730df4cd40b174404168ed73f4438e6d02d2847..9605f8f99ac04bf72032b1cc8a64635bb6c2a8b8 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-1076,7
+1076,8
@@
class YoutubeDL(object):
else self.params['merge_output_format'])
selected_format = {
'requested_formats': formats_info,
- 'format': rf,
+ 'format': '%s+%s' % (formats_info[0].get('format'),
+ formats_info[1].get('format')),
'format_id': '%s+%s' % (formats_info[0].get('format_id'),
formats_info[1].get('format_id')),
'width': formats_info[0].get('width'),