Merge tag 'upstream/2013.10.23'

[youtubedl] / youtube_dl / extractor / cspan.py

diff --git a/youtube_dl/extractor/cspan.py b/youtube_dl/extractor/cspan.py
index a4853279bbfc0bce6517a2b1d032ea1eafe07482..7bf03c584c7388b162c9b3912a4aa0f410ed5b22 100644 (file)
--- a/youtube_dl/extractor/cspan.py
+++ b/youtube_dl/extractor/cspan.py
@@ -34,8 +34,6 @@ class CSpanIE(InfoExtractor):
         description = self._html_search_regex(r'<meta (?:property="og:|name=")description" content="(.*?)"',
                                               webpage, 'description',
                                               flags=re.MULTILINE|re.DOTALL)
         description = self._html_search_regex(r'<meta (?:property="og:|name=")description" content="(.*?)"',
                                               webpage, 'description',
                                               flags=re.MULTILINE|re.DOTALL)

-        thumbnail = self._html_search_regex(r'<meta property="og:image" content="(.*?)"',
-                                            webpage, 'thumbnail')

 
         url = self._search_regex(r'<string name="URL">(.*?)</string>',
                                  video_info, 'video url')
 
         url = self._search_regex(r'<string name="URL">(.*?)</string>',
                                  video_info, 'video url')


@@ -49,5 +47,5 @@ class CSpanIE(InfoExtractor):
                 'url': url,
                 'play_path': path,
                 'description': description,
                 'url': url,
                 'play_path': path,
                 'description': description,

-                'thumbnail': thumbnail,
+                'thumbnail': self._og_search_thumbnail(webpage),

                 }
                 }