aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/options.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-07-11 21:58:12 +0600
committerSergey M․ <dstftw@gmail.com>2015-07-11 21:58:12 +0600
commitac9ed061ec08ad360a0422ddb68060bdcc72baa2 (patch)
tree61cabec165c6a9438bc1c66905c7e66dfc1ef265 /youtube_dl/options.py
parentd919fa3344463f94a152a10ba65981cd290d9ec8 (diff)
parentaa5d9a79d6b5c354ee4a6bfbb43f94c2485ab9b4 (diff)
downloadyoutube-dl-ac9ed061ec08ad360a0422ddb68060bdcc72baa2.tar.xz
Merge branch 'master' of https://github.com/aurium/youtube-dl into 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..c15dadb21 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|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,