schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master

Browse source
This commit is contained in:
Sergey M․ 2015-07-11 21:58:12 +06:00
commit ac9ed061ec
6 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/__init__.py
View file

@ -169,7 +169,7 @@ def _real_main(argv=None):
if not opts.audioquality.isdigit():
parser.error('invalid audio quality specified')
if opts.recodevideo is not None:
if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv']:
if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv', 'xvid']:
parser.error('invalid video recode format specified')
if opts.convertsubtitles is not None:
if opts.convertsubtitles not in ['srt', 'vtt', 'ass']:
@ -354,6 +354,7 @@ def _real_main(argv=None):
'extract_flat': opts.extract_flat,
'merge_output_format': opts.merge_output_format,
'postprocessors': postprocessors,
'postprocessor_args': shlex.split(opts.postprocessor_args or ''),
'fixup': opts.fixup,
'source_address': opts.source_address,
'call_home': opts.call_home,