浏览代码

[YoutubeDL] Don't dowload formats for merging if the first doesn't contain the video (#4132)

Jaime Marquínez Ferrándiz 10 年之前
父节点
当前提交
f866e474f3
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      youtube_dl/YoutubeDL.py

+ 7 - 0
youtube_dl/YoutubeDL.py

@@ -835,6 +835,13 @@ class YoutubeDL(object):
                         format_1, format_2 = rf.split('+')
                         formats_info = (self.select_format(format_1, formats),
                             self.select_format(format_2, formats))
+                        # The first format must contain the video and the
+                        # second the audio
+                        if formats_info[0].get('vcodec') == 'none':
+                            self.report_error('The first format must contain '
+                                'the video, try using "-f %s+%s"' %
+                                (format_2, format_1))
+                            return
                         if all(formats_info):
                             selected_format = {
                                 'requested_formats': formats_info,