diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-01 23:13:49 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-01 23:13:49 +0200 |
| commit | a4446482027156c8221351d677bed8927d74e231 (patch) | |
| tree | 824d5ef46706389ade7802b6e0812b1da2f088f3 /youtube_dl | |
| parent | 7ca2e11f24aa1b4232cb0ce9f9f33c98f76f3aa1 (diff) | |
| parent | 9b330db7f00bd6f4755507cc9f687958acdd2c87 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
youtube_dl/extractor/eporner.py
youtube_dl/extractor/hornbunny.py
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/sunporno.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dl/extractor/sunporno.py index c7a46eb71..7de3c9dd5 100644 --- 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, } |