Merge remote-tracking branch 'upstream/master'

diff --git a/youtube_dl/extractor/tube8.py b/youtube_dl/extractor/tube8.py
index 08a48c05acf34b6cd190ba52d58189935fe6b20f..39f20c54688e9371f5a299e04b84919de2db4f4e 100644 (file)
--- a/youtube_dl/extractor/tube8.py
+++ b/youtube_dl/extractor/tube8.py
@@ -14,7 +14,7 @@ from ..aes import aes_decrypt_text
 
 
 class Tube8IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tube8\.com/(?:[^/]+/){2}(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?tube8\.com/(?:gay/|shemale/)?(?:[^/]+/){2}(?P<id>\d+)'
     _TEST = {
         'url': 'http://www.tube8.com/teen/kasia-music-video/229795/',
         'md5': '44bf12b98313827dd52d35b8706a4ea0',