diff options
| author | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-16 03:51:51 -0700 |
|---|---|---|
| committer | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-16 03:51:51 -0700 |
| commit | 247a5da704d2b34ce855016fe8fb5861ba3ba6da (patch) | |
| tree | 0d28a56958d3a078f949d9f64114bc41974d7880 /youtube_dl/extractor/generic.py | |
| parent | d1b4617e1d5dd055810a309332a33757ecc8ef9d (diff) | |
| parent | 49807b4ac6aab2db702afbde20215641210e0413 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index bcb076594..8e915735e 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -706,6 +706,13 @@ class GenericIE(InfoExtractor): url = unescapeHTML(mobj.group('url')) return self.url_result(url, ie='MTVServicesEmbedded') + # Look for embedded yahoo player + mobj = re.search( + r'<iframe[^>]+?src=(["\'])(?P<url>https?://(?:screen|movies)\.yahoo\.com/.+?\.html\?format=embed)\1', + webpage) + if mobj is not None: + return self.url_result(mobj.group('url'), 'Yahoo') + # Start with something easy: JW Player in SWFObject found = re.findall(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage) if not found: |