X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=356697015a0f66beb1fec48ee52f5f72460b8a60;hb=1866432db74946c2b66263d38ed2c9d9d7e3177d;hp=ace17857c8cb28320ba1fab2988e56c020583af7;hpb=62bd6589c7f087ab81865993a87bdba6eb651293;p=youtube-dl.git diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index ace17857c..356697015 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']: @@ -227,6 +227,7 @@ def _real_main(argv=None): postprocessors.append({ 'key': 'FFmpegVideoConvertor', 'preferedformat': opts.recodevideo, + 'extra_cmd_args': opts.postprocessor_args, }) if opts.convertsubtitles: postprocessors.append({