From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Sat, 14 Aug 2010 10:15:31 +0000 (+0200)
Subject: Allow the #! notation for YouTube URLs found in many links in their website
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2933532c5bd4c49d325f3fa485e0b3c9ea080952;p=youtube-dl

Allow the #! notation for YouTube URLs found in many links in their website
---

diff --git a/youtube-dl b/youtube-dl
index 7bb8146e0..d7b30adca 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -686,7 +686,7 @@ class InfoExtractor(object):
 class YoutubeIE(InfoExtractor):
 	"""Information extractor for youtube.com."""
 
-	_VALID_URL = r'^((?:http://)?(?:youtu\.be/|(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:_popup)?(?:\.php)?)?[\?#](?:.+&)?v=))))?([0-9A-Za-z_-]+)(?(1).+)?$'
+	_VALID_URL = r'^((?:http://)?(?:youtu\.be/|(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?: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 = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
 	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'