projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d120e90
)
Passing the option into the main program's arguments
author
Andrei Troie
<andreitroie90@gmail.com>
Sat, 10 Jan 2015 00:03:11 +0000
(
00:03
+0000)
committer
Andrei Troie
<andreitroie90@gmail.com>
Sat, 10 Jan 2015 00:03:11 +0000
(
00:03
+0000)
youtube_dl/__init__.py
patch
|
blob
|
history
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 844992d8e192960c99935d7cdd7a564d22bda44a..b4ae35a2ba901f4f25325b204740de9e5df91a6f 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-166,6
+166,9
@@
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.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:
if opts.date is not None:
date = DateRange.day(opts.date)
else:
@@
-323,6
+326,7
@@
def _real_main(argv=None):
'encoding': opts.encoding,
'exec_cmd': opts.exec_cmd,
'extract_flat': opts.extract_flat,
'encoding': opts.encoding,
'exec_cmd': opts.exec_cmd,
'extract_flat': opts.extract_flat,
+ 'merge_output_format': opts.merge_output_format,
'postprocessors': postprocessors,
}
'postprocessors': postprocessors,
}