projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Improve extraction in 429 error conditions (closes #24283)
[youtube-dl]
/
youtube_dl
/
options.py
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index e83d546a082af8e24f2f01438605aabad41857af..8826b382c3cc70ab21bacef8de94314ec193948b 100644
(file)
--- a/
youtube_dl/options.py
+++ b/
youtube_dl/options.py
@@
-45,7
+45,7
@@
def parseOpts(overrideArguments=None):
except IOError:
return default # silently skip if file is not present
try:
except IOError:
return default # silently skip if file is not present
try:
- # FIXME: https://github.com/
rg3
/youtube-dl/commit/dfe5fa49aed02cf36ba9f743b11b0903554b5e56
+ # FIXME: https://github.com/
ytdl-org
/youtube-dl/commit/dfe5fa49aed02cf36ba9f743b11b0903554b5e56
contents = optionf.read()
if sys.version_info < (3,):
contents = contents.decode(preferredencoding())
contents = optionf.read()
if sys.version_info < (3,):
contents = contents.decode(preferredencoding())
@@
-134,7
+134,7
@@
def parseOpts(overrideArguments=None):
action='help',
help='Print this help text and exit')
general.add_option(
action='help',
help='Print this help text and exit')
general.add_option(
- '-
v', '-
-version',
+ '--version',
action='version',
help='Print program version and exit')
general.add_option(
action='version',
help='Print program version and exit')
general.add_option(
@@
-841,11
+841,11
@@
def parseOpts(overrideArguments=None):
postproc.add_option(
'--prefer-avconv',
action='store_false', dest='prefer_ffmpeg',
postproc.add_option(
'--prefer-avconv',
action='store_false', dest='prefer_ffmpeg',
- help='Prefer avconv over ffmpeg for running the postprocessors
(default)
')
+ help='Prefer avconv over ffmpeg for running the postprocessors')
postproc.add_option(
'--prefer-ffmpeg',
action='store_true', dest='prefer_ffmpeg',
postproc.add_option(
'--prefer-ffmpeg',
action='store_true', dest='prefer_ffmpeg',
- help='Prefer ffmpeg over avconv for running the postprocessors')
+ help='Prefer ffmpeg over avconv for running the postprocessors
(default)
')
postproc.add_option(
'--ffmpeg-location', '--avconv-location', metavar='PATH',
dest='ffmpeg_location',
postproc.add_option(
'--ffmpeg-location', '--avconv-location', metavar='PATH',
dest='ffmpeg_location',