Merge remote-tracking branch 'upstream/master'

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 2bd5ec33b92fbb7e8bc9d8d368a9cbfe763ab92a..bac9e74c4dc6ac055ac72257ff4594b8f4d1d28f 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -66,6 +66,7 @@ __authors__  = (
     'Naglis Jonaitis',
     'Charles Chen',
     'Hassaan Ali',
+    'Dobrosław Żybort',
 )
 
 __license__ = 'Public Domain'

diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
index 10844f39e68180eba148a09f87b588df8c2b8a03..11c7d7e817f1f0839604311534dd918b5b5e4fee 100644 (file)
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@ -276,7 +276,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
         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

diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index 401fa3d10cd9201a889c6ddcde36f89015159919..08b5339f6e377294deca4372862a4b288b4d9023 100644 (file)
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@
 
-__version__ = '2014.08.02.1'
+__version__ = '2014.08.05'