logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: a4446482027156c8221351d677bed8927d74e231
parent 7ca2e11f24aa1b4232cb0ce9f9f33c98f76f3aa1
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Mon,  1 Sep 2014 23:13:49 +0200

Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/extractor/eporner.py
	youtube_dl/extractor/hornbunny.py

Diffstat:

Myoutube_dl/extractor/sunporno.py2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dl/extractor/sunporno.py @@ -23,6 +23,7 @@ class SunPornoIE(InfoExtractor): 'description': 'md5:a31241990e1bd3a64e72ae99afb325fb', 'thumbnail': 're:^https?://.*\.jpg$', 'duration': 302, + 'age_limit': 18, } } @@ -65,4 +66,5 @@ class SunPornoIE(InfoExtractor): 'view_count': view_count, 'comment_count': comment_count, 'formats': formats, + 'age_limit': 18, }