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

This commit is contained in:
Sergey M․
2015-07-11 21:58:12 +06:00
6 changed files with 21 additions and 7 deletions

View File

@ -691,7 +691,11 @@ def parseOpts(overrideArguments=None):
postproc.add_option(
'--recode-video',
metavar='FORMAT', dest='recodevideo', default=None,
help='Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv)')
help='Encode the video to another format if necessary (currently supported: mp4|flv|ogg|webm|mkv|xvid)')
postproc.add_option(
'--postprocessor-args',
dest='postprocessor_args', default=None, metavar='ARGS',
help='Extra parameters for video post-processor.')
postproc.add_option(
'-k', '--keep-video',
action='store_true', dest='keepvideo', default=False,