projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit @hojel for fc2 and other extractors (#2877)
[youtube-dl]
/
youtube_dl
/
__init__.py
diff --git
a/youtube_dl/__init__.py
b/youtube_dl/__init__.py
index 1d8cf9a0915dcd22176e9643a2c625211bfe4b50..4e657e297d1a5ddb2aac4a448a8a94a0ac4cf180 100644
(file)
--- a/
youtube_dl/__init__.py
+++ b/
youtube_dl/__init__.py
@@
-53,6
+53,9
@@
__authors__ = (
'Mattias Harrysson',
'phaer',
'Sainyam Kapoor',
'Mattias Harrysson',
'phaer',
'Sainyam Kapoor',
+ 'Nicolas Évrard',
+ 'Jason Normore',
+ 'Hoje Lee',
)
__license__ = 'Public Domain'
)
__license__ = 'Public Domain'
@@
-677,7
+680,7
@@
def _real_main(argv=None):
if not opts.audioquality.isdigit():
parser.error(u'invalid audio quality specified')
if opts.recodevideo is not None:
if not opts.audioquality.isdigit():
parser.error(u'invalid audio quality specified')
if opts.recodevideo is not None:
- if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg']:
+ if opts.recodevideo not in ['mp4', 'flv', 'webm', 'ogg'
, 'mkv'
]:
parser.error(u'invalid video recode format specified')
if opts.date is not None:
date = DateRange.day(opts.date)
parser.error(u'invalid video recode format specified')
if opts.date is not None:
date = DateRange.day(opts.date)