Merge branch 'master' of github.com:rg3/youtube-dl

youtube_dl/extractor/cspan.py

@@ -67,6 +67,11 @@ class CSpanIE(InfoExtractor):
             matches = results[0]
             video_type, video_id = matches.groups()
             video_type = 'clip' if video_type == 'id' else 'program'
+        else:
+            m = re.search(r'data-(?P<type>clip|prog)id=["\'](?P<id>\d+)', webpage)
+            if m:
+                video_id = m.group('id')
+                video_type = 'program' if m.group('type') == 'prog' else 'clip'
             else:
                 senate_isvp_url = SenateISVPIE._search_iframe_url(webpage)
                 if senate_isvp_url: