Merge remote-tracking branch 'upstream/master'

youtube_dl/__init__.py

@@ -66,6 +66,7 @@
     'Naglis Jonaitis',
     'Charles Chen',
     'Hassaan Ali',
+    'Dobrosław Żybort',
 )
 
 __license__ = 'Public Domain'

youtube_dl/extractor/vimeo.py

@@ -276,7 +276,7 @@ def _real_extract(self, url):
         if video_thumbnail is None:
             video_thumbs = config["video"].get("thumbs")
             if video_thumbs and isinstance(video_thumbs, dict):
-                _, video_thumbnail = sorted((int(width), t_url) for (width, t_url) in video_thumbs.items())[-1]
+                _, video_thumbnail = sorted((int(width if width.isdigit() else 0), t_url) for (width, t_url) in video_thumbs.items())[-1]
 
         # Extract video description
         video_description = None

youtube_dl/version.py

@@ -1,2 +1,2 @@
 
-__version__ = '2014.08.02.1'
+__version__ = '2014.08.05'