aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-10-15 13:50:53 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-10-15 13:50:53 +0200
commit09a42738fc5a060208cad5fa5579688225e53464 (patch)
tree1312b7217409722583db95ad315446c1064c42b9 /youtube_dl
parentdf928d500fa2bcbee5a18fae9454e22e0c223624 (diff)
downloadyoutube-dl-09a42738fc5a060208cad5fa5579688225e53464.tar.xz
[generic] Correct handling of embedded vimeo players (#3955)
Diffstat (limited to 'youtube_dl')
-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 122763a23..158dc95a5 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -609,13 +609,13 @@ class GenericIE(InfoExtractor):
if mobj:
player_url = unescapeHTML(mobj.group('url'))
surl = smuggle_url(player_url, {'Referer': url})
- return self.url_result(surl, 'Vimeo')
+ return self.url_result(surl)
# Look for embedded (swf embed) Vimeo player
mobj = re.search(
- r'<embed[^>]+?src="(https?://(?:www\.)?vimeo\.com/moogaloop\.swf.+?)"', webpage)
+ r'<embed[^>]+?src="((?:https?:)?//(?:www\.)?vimeo\.com/moogaloop\.swf.+?)"', webpage)
if mobj:
- return self.url_result(mobj.group(1), 'Vimeo')
+ return self.url_result(mobj.group(1))
# Look for embedded YouTube player
matches = re.findall(r'''(?x)