X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fted.py;h=d260c91c2172deabb697c3ad242cfda24f395d41;hb=8f0c8fb45282caa706c267700f51734bb474fefc;hp=5b24716d99fbf4ce6d49652acaca1f37cefa739c;hpb=f07a9f6f4347facde15a0cca9560119f0b6f8a94;p=youtube-dl diff --git a/youtube_dl/extractor/ted.py b/youtube_dl/extractor/ted.py index 5b24716d9..d260c91c2 100644 --- a/youtube_dl/extractor/ted.py +++ b/youtube_dl/extractor/ted.py @@ -51,16 +51,13 @@ class TEDIE(SubtitlesInfoExtractor): } }, { 'url': 'http://www.ted.com/talks/gabby_giffords_and_mark_kelly_be_passionate_be_courageous_be_your_best', + 'md5': '49144e345a899b8cb34d315f3b9cfeeb', 'info_dict': { 'id': '1972', - 'ext': 'flv', + 'ext': 'mp4', 'title': 'Be passionate. Be courageous. Be your best.', 'uploader': 'Gabby Giffords and Mark Kelly', - 'description': 'md5:d89e1d8ebafdac8e55df4c219ecdbfe9', - }, - 'params': { - # rtmp download - 'skip_download': True, + 'description': 'md5:5174aed4d0f16021b704120360f72b92', }, }] @@ -178,7 +175,10 @@ class TEDIE(SubtitlesInfoExtractor): title = self._html_search_regex( r"(?s)(.+?)", webpage, 'title') description = self._html_search_regex( - r'(?s)

.*?

(.*?)', + [ + r'(?s)

.*?

(.*?)', + r'(?s)

About this talk:\s+(.*?)

', + ], webpage, 'description', fatal=False) return {