Merge d53f959a72 into 7d740e7dc7

youtube_dl/extractor/abc.py

@@ -67,8 +67,15 @@ class ABCIE(InfoExtractor):
         mobj = re.search(
             r'inline(?P<type>Video|Audio|YouTube)Data\.push\((?P<json_data>[^)]+)\);',
             webpage)
+
+        youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None)
+        if youtube_link:
+            youtube_link = "http://www.youtube.com/" + youtube_link
+            return self.url_result(youtube_link)
+
         if mobj is None:
             expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?<span>(.+?)</span>', webpage, 'expired', None)
+
             if expired:
                 raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True)
             raise ExtractorError('Unable to extract video urls')

youtube_dl/extractor/espn.py

@@ -20,7 +20,7 @@ class ESPNIE(OnceIE):
                                 (?:
                                     (?:(?:\w+\.)+)?espn\.go|
                                     (?:www\.)?espn
-                                )\.com/
+                                )\.co(m|\.uk)/
                                 (?:
                                     (?:
                                         video/(?:clip|iframe/twitter)|
@@ -72,7 +72,7 @@ class ESPNIE(OnceIE):
         'url': 'https://cdn.espn.go.com/video/clip/_/id/19771774',
         'only_matching': True,
     }, {
-        'url': 'http://www.espn.com/watch/player?id=19141491',
+        'url': ' ',
         'only_matching': True,
     }, {
         'url': 'http://www.espn.com/watch/player?bucketId=257&id=19505875',