diff options
| author | M.Yasoob Khalid <yasoob.khld@gmail.com> | 2013-06-26 15:30:21 +0500 |
|---|---|---|
| committer | M.Yasoob Khalid <yasoob.khld@gmail.com> | 2013-06-26 15:30:21 +0500 |
| commit | d1bd37deac4fb61b350ba488bdbdf230aa0b335c (patch) | |
| tree | 8bf85a6a82183a47d1732a81dccc36bb1ae25a9d /youtube_dl | |
| parent | 405ec05cb2a1bb1ce27353a831924c17f57b86f4 (diff) | |
| parent | 52e8e1dc88ad177abcbb6a52b3b262527f7a1f20 (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/YoutubeDL.py | 2 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index e9a24a95a..9931c98e9 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -75,7 +75,7 @@ class YoutubeDL(object): writeautomaticsub: Write the automatic subtitles to a file allsubtitles: Downloads all the subtitles of the video listsubtitles: Lists all available subtitles for the video - subtitlesformat: Subtitle format [sbv/srt] (default=srt) + subtitlesformat: Subtitle format [srt/sbv/vtt] (default=srt) subtitleslang: Language of the subtitles to download keepvideo: Keep the video file after post-processing daterange: A DateRange object, download only if the upload_date is in the range. diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 42abb8358..6a8fc5e96 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -205,7 +205,7 @@ def parseOpts(overrideArguments=None): help='lists all available subtitles for the video (currently youtube only)', default=False) video_format.add_option('--sub-format', action='store', dest='subtitlesformat', metavar='FORMAT', - help='subtitle format [srt/sbv] (default=srt) (currently youtube only)', default='srt') + help='subtitle format [srt/sbv/vtt] (default=srt) (currently youtube only)', default='srt') video_format.add_option('--sub-lang', '--srt-lang', action='store', dest='subtitleslang', metavar='LANG', help='language of the subtitles to download (optional) use IETF language tags like \'en\'') |