X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2F__init__.py;h=d39eb830f4a9ff5c5ec3b559a74ce2eb6b5c9806;hb=e9c092f1252d64040aa181f606e23cf7fc533dc1;hp=2aaafd37a30e5b51af74b8bdfaddd53c4a20b895;hpb=62e609ab771140b185e98ed085445d40b751cbfc;p=youtube-dl

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 2aaafd37a..d39eb830f 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -47,12 +47,16 @@ __authors__  = (
     'Michael Kaiser',
     'Niklas Laxström',
     'David Triendl',
+    'Anthony Weems',
+    'David Wagner',
+    'Juan C. Olivares',
 )
 
 __license__ = 'Public Domain'
 
 import codecs
 import getpass
+import io
 import locale
 import optparse
 import os
@@ -426,6 +430,8 @@ def parseOpts(overrideArguments=None):
                   '%(extractor)s for the provider (youtube, metacafe, etc), '
                   '%(id)s for the video id, %(playlist)s for the playlist the video is in, '
                   '%(playlist_index)s for the position in the playlist and %% for a literal percent. '
+                  '%(height)s and %(width)s for the width and height of the video format. '
+                  '%(resolution)s for a textual description of the resolution of the video format. '
                   'Use - to output to stdout. Can also be used to download to a different directory, '
                   'for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .'))
     filesystem.add_option('--autonumber-size',