projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1422 from rzhxeo/xhamster
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 0083f2e99cfbc7a4ec28924a75de851f24c75f2f..0022a4e7a8b32b734904d356d8ef24232a9e47ea 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-29,6
+29,7
@@
__authors__ = (
'Albert Kim',
'Pierre Rudloff',
'Huarong Huo',
'Albert Kim',
'Pierre Rudloff',
'Huarong Huo',
+ 'Ismael Mejía',
)
__license__ = 'Public Domain'
)
__license__ = 'Public Domain'
@@
-532,6
+533,11
@@
def _real_main(argv=None):
else:
date = DateRange(opts.dateafter, opts.datebefore)
else:
date = DateRange(opts.dateafter, opts.datebefore)
+ # --all-sub automatically sets --write-sub if --write-auto-sub is not given
+ # this was the old behaviour if only --all-sub was given.
+ if opts.allsubtitles and (opts.writeautomaticsub == False):
+ opts.writesubtitles = True
+
if sys.version_info < (3,):
# In Python 2, sys.argv is a bytestring (also note http://bugs.python.org/issue2128 for Windows systems)
if opts.outtmpl is not None:
if sys.version_info < (3,):
# In Python 2, sys.argv is a bytestring (also note http://bugs.python.org/issue2128 for Windows systems)
if opts.outtmpl is not None: