From: Jeff Crouse <jefftimesten@gmail.com>
Date: Sun, 16 Dec 2012 04:22:07 +0000 (-0500)
Subject: Fixed a problem with the XNXXIE Regex
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9a2cf56d512d0a459af652b1262255601b4a86e8;p=youtube-dl

Fixed a problem with the XNXXIE Regex
---

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 15dd15307..c44fc852c 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3186,7 +3186,7 @@ class YoukuIE(InfoExtractor):
 class XNXXIE(InfoExtractor):
 	"""Information extractor for xnxx.com"""
 
-	_VALID_URL = r'^http://video\.xnxx\.com/video([0-9]+)/(.*)'
+	_VALID_URL = r'^(?:https?://)?video\.xnxx\.com/video([0-9]+)/(.*)'
 	IE_NAME = u'xnxx'
 	VIDEO_URL_RE = r'flv_url=(.*?)&amp;'
 	VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM'
@@ -3509,7 +3509,7 @@ class YouPornIE(InfoExtractor):
 			})
 
 		if self._downloader.params.get('listformats', None):
-			self._print_formats(results)
+			self._print_formats(formats)
 			return
 
 		req_format = self._downloader.params.get('format', None)