diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-07-11 21:58:12 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-07-11 21:58:12 +0600 |
| commit | ac9ed061ec08ad360a0422ddb68060bdcc72baa2 (patch) | |
| tree | 61cabec165c6a9438bc1c66905c7e66dfc1ef265 /youtube_dl/__init__.py | |
| parent | d919fa3344463f94a152a10ba65981cd290d9ec8 (diff) | |
| parent | aa5d9a79d6b5c354ee4a6bfbb43f94c2485ab9b4 (diff) | |
Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 215b616de..fb31d1569 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -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, |