aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-06-27 22:25:34 +0700
committerSergey M․ <dstftw@gmail.com>2017-06-27 22:38:54 +0700
commit0646e34c7d511a02d8d93e840bceaa3521c2204e (patch)
tree939e82fb750cf3c18f2e4047987c365072ffa53e /youtube_dl/extractor/generic.py
parentbf2dc9cc6e1ca38955f646b67f0f6ec40aec139d (diff)
downloadyoutube-dl-0646e34c7d511a02d8d93e840bceaa3521c2204e.tar.xz
[facebook] Add support for plugin video embeds and multiple embeds (closes #13493)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 8ef1a2980..760a7f9c2 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -2222,9 +2222,9 @@ class GenericIE(InfoExtractor):
return self.url_result(mobj.group('url'))
# Look for embedded Facebook player
- facebook_url = FacebookIE._extract_url(webpage)
- if facebook_url is not None:
- return self.url_result(facebook_url, 'Facebook')
+ facebook_urls = FacebookIE._extract_urls(webpage)
+ if facebook_urls:
+ return self.playlist_from_matches(facebook_urls, video_id, video_title)
# Look for embedded VK player
mobj = re.search(r'<iframe[^>]+?src=(["\'])(?P<url>https?://vk\.com/video_ext\.php.+?)\1', webpage)