diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-09-16 03:32:53 +0200 |
| commit | ef66b0c6effb9d8741807abb12b059560c97c8da (patch) | |
| tree | 8230663fc475477863b78884078bba918a1edea4 /youtube_dl/__init__.py | |
| parent | 22b50ecb2f7f9e0469d281a4c401d4a531c1cc5b (diff) | |
| parent | 5a6fecc3dee35f95f3590a31e51670819db5a1fe (diff) | |
| download | youtube-dl-ef66b0c6effb9d8741807abb12b059560c97c8da.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 696e54f49..0022a4e7a 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -533,6 +533,11 @@ def _real_main(argv=None): 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: |