aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/generic.py
diff options
context:
space:
mode:
authorPetr Půlpán <Pulpan3@gmail.com>2014-06-29 16:44:37 +0200
committerPetr Půlpán <Pulpan3@gmail.com>2014-06-29 16:44:37 +0200
commit825cdcec3c8a2ef8677ae60b57fe7fe6b936f473 (patch)
treeba7d24f0d518793b0fe0276a6f728a1e2f7b4d23 /youtube_dl/extractor/generic.py
parent41b610acab43c03f71fb64ae55c0912352143ae7 (diff)
parent0364fa8b65a6c6742454ec5f3a858e06dc1527f7 (diff)
downloadyoutube-dl-825cdcec3c8a2ef8677ae60b57fe7fe6b936f473.tar.xz
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl/extractor/generic.py')
-rw-r--r--youtube_dl/extractor/generic.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 9dd03aba4..869efb215 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -620,6 +620,11 @@ class GenericIE(InfoExtractor):
if mobj is not None:
return self.url_result(mobj.group('url'), 'VK')
+ # Look for embedded ivi player
+ mobj = re.search(r'<embed[^>]+?src=(["\'])(?P<url>https?://(?:www\.)?ivi\.ru/video/player.+?)\1', webpage)
+ if mobj is not None:
+ return self.url_result(mobj.group('url'), 'Ivi')
+
# Look for embedded Huffington Post player
mobj = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>https?://embed\.live\.huffingtonpost\.com/.+?)\1', webpage)