X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=4e657e297d1a5ddb2aac4a448a8a94a0ac4cf180;hb=25dfe0eb10aedb1ac22a5c9624fc0e35d9e0b926;hp=74b43b41dba10d741b0b51b3093f63ab5ff5e3f5;hpb=bbe99d26ecf148390a4c5740ccd9ab86bd108cd5;p=youtube-dl

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 74b43b41d..4e657e297 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -54,6 +54,8 @@ __authors__  = (
     'phaer',
     'Sainyam Kapoor',
     'Nicolas Évrard',
+    'Jason Normore',
+    'Hoje Lee',
 )
 
 __license__ = 'Public Domain'
@@ -678,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 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)