[generic] Support YouTube swf embed (Fixes #2010)

2013-12-19 20:44:30 +01:00 · 2013-12-19 20:44:30 +01:00 · 1f9da9049b
parent c0d0b01f0e
commit 1f9da9049b
1 changed files with 5 additions and 2 deletions
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@ -233,8 +233,11 @@ class GenericIE(InfoExtractor):
            return self.url_result(surl, 'Vimeo')

        # Look for embedded YouTube player
-        matches = re.findall(
-            r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?youtube\.com/embed/.+?)\1', webpage)
+        matches = re.findall(r'''(?x)
+            (?:<iframe[^>]+?src=|embedSWF\(\s*)
+            (["\'])(?P<url>(?:https?:)?//(?:www\.)?youtube\.com/
+                (?:embed|v)/.+?)
+            \1''', webpage)
        if matches:
            urlrs = [self.url_result(unescapeHTML(tuppl[1]), 'Youtube')
                     for tuppl in matches]