depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-22 16:57:40 +00:00
Code Issues Releases Wiki Activity

[YoutubeDL] Check formats for merge to be opposite (#7786)

Browse source
This commit is contained in:
Sergey M․ 2015-12-07 23:10:57 +06:00
parent 1775612512
commit 3d24bbfbe4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
youtube_dl/YoutubeDL.py
View file

@ -1110,6 +1110,12 @@ class YoutubeDL(object):
'contain the video, try using ' 'contain the video, try using '
'"-f %s+%s"' % (format_2, format_1)) '"-f %s+%s"' % (format_2, format_1))
return 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 = ( output_ext = (
formats_info[0]['ext'] formats_info[0]['ext']
if self.params.get('merge_output_format') is None if self.params.get('merge_output_format') is None