depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 20:22:14 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'rbrito/set-age'

Browse source 
Conflicts:
	youtube_dl/extractor/xhamster.py
This commit is contained in:
Philipp Hagemeister 2013-10-19 21:16:14 +02:00
commit f8b45beacc
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/extractor/redtube.py
View file

@ -10,7 +10,8 @@ class RedTubeIE(InfoExtractor):
u'file': u'66418.mp4', u'file': u'66418.mp4',
u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
u'info_dict': { u'info_dict': {
u"title": u"Sucked on a toilet" u"title": u"Sucked on a toilet",
u"age_limit": 18,
} }
} }

4
youtube_dl/extractor/xvideos.py
View file

@ -13,7 +13,8 @@ class XVideosIE(InfoExtractor):
u'file': u'939581.flv', u'file': u'939581.flv',
u'md5': u'1d0c835822f0a71a7bf011855db929d0', u'md5': u'1d0c835822f0a71a7bf011855db929d0',
u'info_dict': { u'info_dict': {
u"title": u"Funny Porns By >>>>S<<<<<< -1" u"title": u"Funny Porns By >>>>S<<<<<< -1",
u"age_limit": 18,
} }
} }
@ -46,6 +47,7 @@ class XVideosIE(InfoExtractor):
'ext': 'flv', 'ext': 'flv',
'thumbnail': video_thumbnail, 'thumbnail': video_thumbnail,
'description': None, 'description': None,
'age_limit': 18,
} }
return [info] return [info]

3
youtube_dl/extractor/youporn.py
View file

@ -26,7 +26,8 @@ class YouPornIE(InfoExtractor):
u"upload_date": u"20101221", u"upload_date": u"20101221",
u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?", u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
u"uploader": u"Ask Dan And Jennifer", u"uploader": u"Ask Dan And Jennifer",
u"title": u"Sex Ed: Is It Safe To Masturbate Daily?" u"title": u"Sex Ed: Is It Safe To Masturbate Daily?",
u"age_limit": 18,
} }
} }