diff options
| author | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-05 12:43:30 -0700 |
|---|---|---|
| committer | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-05 12:43:30 -0700 |
| commit | f9f86b0c645ebef9e68d27086d565eb3c057478f (patch) | |
| tree | d7363a5466d8de0d5627b4a06c6e7ff6b3cda491 | |
| parent | 0aed8df2bf12c9e41f1cae7545f1e8379763cbf9 (diff) | |
| parent | 6de0595eb845bc913f3bcae9126a5a8476048e5c (diff) | |
| download | youtube-dl-f9f86b0c645ebef9e68d27086d565eb3c057478f.tar.xz | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | youtube_dl/__init__.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 2 | ||||
| -rw-r--r-- | youtube_dl/version.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 2bd5ec33b..bac9e74c4 100644 --- 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 10844f39e..11c7d7e81 100644 --- 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 401fa3d10..08b5339f6 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,2 +1,2 @@ -__version__ = '2014.08.02.1' +__version__ = '2014.08.05' |