Merge branch 'master' of github.com:rg3/youtube-dl

3 files changed, 5 insertions, 3 deletions

diff --git a/youtube-dl b/youtube-dl
index fd5e09c3b..1055d246d 100755
--- a/youtube-dl
+++ b/youtube-dl
diff --git a/youtube-dl.exe b/youtube-dl.exe
index bf7ba04d0..2b82e43f2 100755
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index bdb2ec311..8d428b25d 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -616,7 +616,7 @@ class MetacafeIE(InfoExtractor):
 class DailymotionIE(InfoExtractor):
 	"""Information Extractor for Dailymotion"""
 
-	_VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^_/]+)_([^/]+)'
+	_VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^/]+)'
 	IE_NAME = u'dailymotion'
 
 	def __init__(self, downloader=None):
@@ -637,7 +637,7 @@ class DailymotionIE(InfoExtractor):
 			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
 			return
 
-		video_id = mobj.group(1)
+		video_id = mobj.group(1).split('_')[0].split('?')[0]
 
 		video_extension = 'mp4'
 
@@ -663,9 +663,11 @@ class DailymotionIE(InfoExtractor):
 		else: max_quality = 'ldURL'
 		mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
 		if mobj is None:
+			mobj = re.search(r'"video_url":"(.*?)",', flashvars)
+		if mobj is None:
 			self._downloader.trouble(u'ERROR: unable to extract media URL')
 			return
-		video_url = mobj.group(1).replace('\\/', '/')
+		video_url = urllib.unquote(mobj.group(1)).replace('\\/', '/')
 
 		# TODO: support choosing qualities