diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
index 938e05076..774fa565c 100644
--- a/youtube_dl/extractor/toypics.py
+++ b/youtube_dl/extractor/toypics.py
@@ -24,15 +24,16 @@ def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
page = self._download_webpage(url, video_id)
- video_url = self._html_search_regex(
- r'src:\s+"(http://static[0-9]+\.toypics\.net/flvideo/[^"]+)"', page, 'video URL')
- title = self._html_search_regex(
- r'
Toypics - ([^<]+)', page, 'title')
+ formats = self._parse_html5_media_entries(url, page, video_id)[0]['formats']
+ title = self._html_search_regex([
+ r']+class=["\']view-video-title[^>]+>([^<]+)([^<]+) - Toypics',
+ ], page, 'title')
username = self._html_search_regex(
- r'toypics.net/([^/"]+)" class="user-name">', page, 'username')
+ r'More videos from ([^<]+)', page, 'username')
return {
'id': video_id,
- 'url': video_url,
+ 'formats': formats,
'title': title,
'uploader': username,
'age_limit': 18,
@@ -71,7 +72,7 @@ def _real_extract(self, url):
note='Downloading page %d/%d' % (n, page_count))
urls.extend(
re.findall(
- r'
\s+',
+ r'