nhyatt/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-06-30 11:02:51 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'subtitles-rework'

Browse Source 
(Closes PR #4964)
This commit is contained in:
Jaime Marquínez Ferrándiz
2015-02-23 17:13:03 +01:00
parent 4432db35d9 b531cfc019
commit bfc993cc91
29 changed files with 532 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/options.py
View File

@ -387,8 +387,8 @@ def parseOpts(overrideArguments=None):
help='lists all available subtitles for the video')
subtitles.add_option(
'--sub-format',
action='store', dest='subtitlesformat', metavar='FORMAT', default='srt',
help='subtitle format (default=srt) ([sbv/vtt] youtube only)')
action='store', dest='subtitlesformat', metavar='FORMAT', default='best',
help='subtitle format, accepts formats preference, for example: "ass/srt/best"')
subtitles.add_option(
'--sub-lang', '--sub-langs', '--srt-lang',
action='callback', dest='subtitleslangs', metavar='LANGS', type='str',