diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-08-28 01:01:04 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-08-28 01:01:04 +0200 |
| commit | 27f774862d583efcfbeb6f97bee53b333a0b95a9 (patch) | |
| tree | 33e89a076265dd367763847792b30adeab3ff47e /youtube_dl/extractor | |
| parent | b759a0d4d2273fdde1f504cdc928ea340e12456e (diff) | |
| parent | 7798fad535750acb2e96f1055062fa98d0694a55 (diff) | |
| download | youtube-dl-27f774862d583efcfbeb6f97bee53b333a0b95a9.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/cbs.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/yahoo.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/cbs.py b/youtube_dl/extractor/cbs.py index 822f9a7be..db48dc24f 100644 --- a/youtube_dl/extractor/cbs.py +++ b/youtube_dl/extractor/cbs.py @@ -25,7 +25,7 @@ class CBSIE(InfoExtractor): }, { 'url': 'http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/', 'info_dict': { - 'id': 'P9gjWjelt6iP', + 'id': 'WWF_5KqY3PK1', 'ext': 'flv', 'title': 'Live on Letterman - St. Vincent', 'description': 'Live On Letterman: St. Vincent in concert from New York\'s Ed Sullivan Theater on Tuesday, July 16, 2014.', diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 0e3b33b16..3ab6017cd 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -71,7 +71,8 @@ class YahooIE(InfoExtractor): if items_json is None: CONTENT_ID_REGEXES = [ r'YUI\.namespace\("Media"\)\.CONTENT_ID\s*=\s*"([^"]+)"', - r'root\.App\.Cache\.context\.videoCache\.curVideo = \{"([^"]+)"' + r'root\.App\.Cache\.context\.videoCache\.curVideo = \{"([^"]+)"', + r'"first_videoid"\s*:\s*"([^"]+)"', ] long_id = self._search_regex(CONTENT_ID_REGEXES, webpage, 'content ID') video_id = long_id |