Merge remote-tracking branch 'ruuk/master'

This commit is contained in:
Philipp Hagemeister 2014-02-26 00:31:08 +01:00
commit 0d7caf5cdf

View File

@ -166,6 +166,7 @@ def _real_extract(self, url):
video_title = self._html_search_regex(r'(?im)<title>(.*) - Video</title>', webpage, u'title')
description = self._og_search_description(webpage)
thumbnail = self._og_search_thumbnail(webpage)
video_uploader = self._html_search_regex(
r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);',
webpage, u'uploader nickname', fatal=False)
@ -183,6 +184,7 @@ def _real_extract(self, url):
'uploader': video_uploader,
'upload_date': None,
'title': video_title,
'thumbnail':thumbnail,
'ext': video_ext,
'age_limit': age_limit,
}