Update upstream source from tag 'upstream/2018.11.07'

[youtubedl] / youtube_dl / extractor / screencast.py

diff --git a/youtube_dl/extractor/screencast.py b/youtube_dl/extractor/screencast.py
index 62a6a8337ccf5d247a38be29cf93b5b72f36dfd7..69a0d01f39c24f9fdcef0d31dd4d9d7a2f082c85 100644 (file)
--- a/youtube_dl/extractor/screencast.py
+++ b/youtube_dl/extractor/screencast.py
@@ -90,6 +90,15 @@ class ScreencastIE(InfoExtractor):
                     r'src=(.*?)(?:$|&)', video_meta,
                     'meta tag video URL', default=None)
 
                     r'src=(.*?)(?:$|&)', video_meta,
                     'meta tag video URL', default=None)
 

+        if video_url is None:
+            video_url = self._html_search_regex(
+                r'MediaContentUrl["\']\s*:(["\'])(?P<url>(?:(?!\1).)+)\1',
+                webpage, 'video url', default=None, group='url')
+
+        if video_url is None:
+            video_url = self._html_search_meta(
+                'og:video', webpage, default=None)
+

         if video_url is None:
             raise ExtractorError('Cannot find video')
 
         if video_url is None:
             raise ExtractorError('Cannot find video')