aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/options.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-07-11 22:59:18 +0600
committerSergey M․ <dstftw@gmail.com>2015-07-11 22:59:18 +0600
commit1f3a43dbe6b289ff7933754007314c1465e8af7f (patch)
tree5aedcd5d0c69574944ea1aebdc5aed0a6a5f9bb8 /youtube_dl/options.py
parentd919fa3344463f94a152a10ba65981cd290d9ec8 (diff)
parent369e195a44530b43bfd0e95087c9e1a238d91184 (diff)
downloadyoutube-dl-1f3a43dbe6b289ff7933754007314c1465e8af7f.tar.xz
Merge branch 'aurium-master'
Diffstat (limited to 'youtube_dl/options.py')
-rw-r--r--youtube_dl/options.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 4762e1e3c..85365d769 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -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|avi)')
+ postproc.add_option(
+ '--postprocessor-args',
+ dest='postprocessor_args', metavar='ARGS',
+ help='Give these arguments to the postprocessor')
postproc.add_option(
'-k', '--keep-video',
action='store_true', dest='keepvideo', default=False,