commit 3d24bbfbe433e3a2b2257096264bf4e846f6d889 parent 1775612512aba3c38455e534d423c36c330af35d Author: Sergey M․ <dstftw@gmail.com> Date: Mon, 7 Dec 2015 23:10:57 +0600 [YoutubeDL] Check formats for merge to be opposite (#7786) Diffstat:
M | youtube_dl/YoutubeDL.py | | | 6 | ++++++ |
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py @@ -1110,6 +1110,12 @@ class YoutubeDL(object): 'contain the video, try using ' '"-f %s+%s"' % (format_2, format_1)) return + # Formats must be opposite (video+audio) + if formats_info[0].get('acodec') == 'none' and formats_info[1].get('acodec') == 'none': + self.report_error( + 'Both formats %s and %s are video-only, you must specify "-f video+audio"' + % (format_1, format_2)) + return output_ext = ( formats_info[0]['ext'] if self.params.get('merge_output_format') is None