about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2011-11-02 10:56:18 -0700
committerPhilipp Hagemeister <phihag@phihag.de>2011-11-02 10:56:18 -0700
commit0fca93ac60cd18bbe67ed0e24d1ea8c33b27ab08 (patch)
tree52a7a737e0389fff60590b6551a35ec85da0344f
parent053419cd245e4af1330bf970a0b919c71cdb3a94 (diff)
parent857e5f329ae03ae9710ce926b8fbed25513ef7d9 (diff)
downloadyoutube-dl-0fca93ac60cd18bbe67ed0e24d1ea8c33b27ab08.tar.gz
youtube-dl-0fca93ac60cd18bbe67ed0e24d1ea8c33b27ab08.tar.xz
youtube-dl-0fca93ac60cd18bbe67ed0e24d1ea8c33b27ab08.zip
Merge pull request #206 from rbrito/fixes/facebook-ie-2
FacebookIE: Fix regexp to recognize videos that weren't considered.
-rwxr-xr-xyoutube-dl2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube-dl b/youtube-dl
index 4c931b401..30a02e5cd 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -2709,7 +2709,7 @@ class DepositFilesIE(InfoExtractor):
 class FacebookIE(InfoExtractor):
 	"""Information Extractor for Facebook"""
 
-	_VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/video/video\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
+	_VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/(?:video/video|photo)\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
 	_LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&'
 	_NETRC_MACHINE = 'facebook'
 	_available_formats = ['video', 'highqual', 'lowqual']