mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-11 13:26:23 +02:00
Merge branch 'master' of github.com:rg3/youtube-dl
This commit is contained in:
commit
3cd69a54b2
@ -486,8 +486,8 @@ class YoutubeIE(InfoExtractor):
|
|||||||
# Extension
|
# Extension
|
||||||
video_extension = self._video_extensions.get(format_param, 'flv')
|
video_extension = self._video_extensions.get(format_param, 'flv')
|
||||||
|
|
||||||
video_format = '{} - {}'.format(format_param if format_param else video_extension,
|
video_format = '{0} - {1}'.format(format_param if format_param else video_extension,
|
||||||
self._video_dimensions.get(format_param, '???'))
|
self._video_dimensions.get(format_param, '???'))
|
||||||
|
|
||||||
results.append({
|
results.append({
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
@ -2649,6 +2649,7 @@ class EscapistIE(InfoExtractor):
|
|||||||
class CollegeHumorIE(InfoExtractor):
|
class CollegeHumorIE(InfoExtractor):
|
||||||
"""Information extractor for collegehumor.com"""
|
"""Information extractor for collegehumor.com"""
|
||||||
|
|
||||||
|
_WORKING = False
|
||||||
_VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/video/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
|
_VALID_URL = r'^(?:https?://)?(?:www\.)?collegehumor\.com/video/(?P<videoid>[0-9]+)/(?P<shorttitle>.*)$'
|
||||||
IE_NAME = u'collegehumor'
|
IE_NAME = u'collegehumor'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user