aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-14 16:07:53 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-14 16:07:53 +0200
commit7394b8db3b8b43886ad46822bfc7631fb82d542b (patch)
tree204bc6ebc2b53604957fe80dcbcccedced82b753 /youtube_dl/__init__.py
parent9378ae6e1d6165c2402890c53c76f7975fee6d7b (diff)
parentea62a2da466e3fce802930d3685d53a159520719 (diff)
downloadyoutube-dl-7394b8db3b8b43886ad46822bfc7631fb82d542b.tar.xz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 3513d719f..fb1270ea2 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -339,6 +339,9 @@ def parseOpts(overrideArguments=None):
filesystem.add_option('--write-info-json',
action='store_true', dest='writeinfojson',
help='write video metadata to a .info.json file', default=False)
+ filesystem.add_option('--write-annotations',
+ action='store_true', dest='writeannotations',
+ help='write video annotations to a .annotation file', default=False)
filesystem.add_option('--write-thumbnail',
action='store_true', dest='writethumbnail',
help='write thumbnail image to disk', default=False)
@@ -601,6 +604,7 @@ def _real_main(argv=None):
'nopart': opts.nopart,
'updatetime': opts.updatetime,
'writedescription': opts.writedescription,
+ 'writeannotations': opts.writeannotations,
'writeinfojson': opts.writeinfojson,
'writethumbnail': opts.writethumbnail,
'writesubtitles': opts.writesubtitles,