Merge pull request #1590 from joeyadams/master

Fix Brightcove detection when another Flash object is on the page

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 7060c6f9258c28c9dcb18681c62882f52715edf9..d48c84f8d575111dd0459056efd33e7338b1a1df 100644 (file)
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -121,7 +121,7 @@ class GenericIE(InfoExtractor):
 
         self.report_extraction(video_id)
         # 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:
             self.to_screen(u'Brightcove video detected.')
             bc_url = BrightcoveIE._build_brighcove_url(m_brightcove.group())