w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
rupertbaxter2 2014-08-05 12:43:30 -07:00
commit f9f86b0c64
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/__init__.py
View file

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

2
youtube_dl/extractor/vimeo.py
View file

@ -276,7 +276,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
if video_thumbnail is None: if video_thumbnail is None:
video_thumbs = config["video"].get("thumbs") video_thumbs = config["video"].get("thumbs")
if video_thumbs and isinstance(video_thumbs, dict): 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 # Extract video description
video_description = None video_description = None

2
youtube_dl/version.py
View file

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