diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 02:03:00 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-10 02:03:00 +0100 |
| commit | bd1a281ede1548ae0f0c74360eb518751c2a4526 (patch) | |
| tree | 1976d14f2df80e8d2e3598822d9e4c1bc1e6339d /youtube_dl/__init__.py | |
| parent | 45598f15788568a8432da19544e5bdc390032aca (diff) | |
| download | youtube-dl-bd1a281ede1548ae0f0c74360eb518751c2a4526.tar.xz | |
[options] PEP8 and simpler --merge-output-format handling (#4673)
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index b4ae35a2b..8e7b74466 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -166,9 +166,7 @@ def _real_main(argv=None): if opts.recodevideo is not None: if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg', 'mkv']: parser.error('invalid video recode format specified') - if opts.merge_output_format is not None and not '+' in opts.format: #if merge format output is used on videos that don't require merging, ignore - opts.merge_output_format = None - + if opts.date is not None: date = DateRange.day(opts.date) else: |