From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sun, 19 Aug 2012 15:00:20 +0000 (+0200)
Subject: Merge 'rbrito/support-tube.majestyc.net' (PR #391) with small fix
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=0e4dc2fc746e75a6ca27830da3fea7b90ed0179e;p=youtube-dl

Merge 'rbrito/support-tube.majestyc.net' (PR #391) with small fix
---

0e4dc2fc746e75a6ca27830da3fea7b90ed0179e
diff --cc youtube_dl/InfoExtractors.py
index ddb4aa16b,d95423f7d..dfd8f76ee
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@@ -95,7 -95,7 +95,7 @@@ class InfoExtractor(object)
  class YoutubeIE(InfoExtractor):
  	"""Information extractor for youtube.com."""
  
- 	_VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
 -	_VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/|tube.majestyc.net/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
++	_VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/|tube\.majestyc\.net/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
  	_LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
  	_LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en'
  	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'