X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fgeneric.py;h=e0d227aec93fd13feecf27409b3fd790b20af1ca;hb=9d0993ec4a07dae779f83490811a6aba2d4711b3;hp=6d3e4fb102a6d0435276d3faee5ea27a88285739;hpb=5c38625259cf50dd7432377aac4daee3aede8f25;p=youtube-dl.git

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 6d3e4fb10..e0d227aec 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -189,7 +189,9 @@ class GenericIE(InfoExtractor):
             'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm',
             'md5': '27b99cdb639c9b12a79bca876a073417',
             'info_dict': {
-                'uploader': 'AU SPA: The NSA and Privacy',
+                'id': '45734260',
+                'ext': 'flv',
+                'uploader': 'AU SPA:  The NSA and Privacy',
                 'title': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman'
             }
         },
@@ -517,10 +519,16 @@ class GenericIE(InfoExtractor):
 
         # Look for embedded NowVideo player
         mobj = re.search(
-            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?nowvideo\.(?:ch|sx|eu)/embed\.php.+?)\1', webpage)
+            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?nowvideo\.(?:ch|sx|eu|at|ag|co)/embed\.php.+?)\1', webpage)
         if mobj is not None:
             return self.url_result(mobj.group('url'), 'NowVideo')
 
+        # Look for embedded VideoWeed player
+        mobj = re.search(
+            r'<iframe[^>]+?src=(["\'])(?P<url>http://(?:(?:embed|www)\.)?videoweed\.(?:es|com)/embed\.php.+?)\1', webpage)
+        if mobj is not None:
+            return self.url_result(mobj.group('url'), 'VideoWeed')
+
         # Look for embedded Facebook player
         mobj = re.search(
             r'<iframe[^>]+?src=(["\'])(?P<url>https://www\.facebook\.com/video/embed.+?)\1', webpage)