Merge pull request #1590 from joeyadams/master

Fix Brightcove detection when another Flash object is on the page
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-10-12 02:09:39 -07:00
commit b4cdc245cf

View File

@ -121,7 +121,7 @@ class GenericIE(InfoExtractor):
self.report_extraction(video_id) self.report_extraction(video_id)
# Look for BrightCove: # Look for BrightCove:
m_brightcove = re.search(r'<object.+?class=([\'"]).*?BrightcoveExperience.*?\1.+?</object>', webpage, re.DOTALL) m_brightcove = re.search(r'<object[^>]+?class=([\'"])[^>]*?BrightcoveExperience.*?\1.+?</object>', webpage, re.DOTALL)
if m_brightcove is not None: if m_brightcove is not None:
self.to_screen(u'Brightcove video detected.') self.to_screen(u'Brightcove video detected.')
bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group()) bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())