diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-25 05:30:47 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-25 05:30:47 +0100 |
| commit | 767ff0a2d19a162edc5ea2d33e82ddb30ae244c8 (patch) | |
| tree | 00d5eca6ac7825372448e4206bcc99b200c376d7 | |
| parent | 8604e882a8f99fcd632efbb94e449477d860218d (diff) | |
| parent | e1ccc04e9f68988df0520b7502edc6479b62378f (diff) | |
| download | youtube-dl-767ff0a2d19a162edc5ea2d33e82ddb30ae244c8.tar.gz youtube-dl-767ff0a2d19a162edc5ea2d33e82ddb30ae244c8.tar.xz youtube-dl-767ff0a2d19a162edc5ea2d33e82ddb30ae244c8.zip | |
Merge branch 'travis-rtmp'
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | youtube_dl/extractor/folketinget.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index f14014414..fb34299fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ python: - "2.7" - "3.3" - "3.4" +before_install: + - sudo apt-get update -qq + - sudo apt-get install -yqq rtmpdump script: nosetests test --verbose notifications: email: diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dl/extractor/folketinget.py index 68e2db943..0fb29de75 100644 --- a/youtube_dl/extractor/folketinget.py +++ b/youtube_dl/extractor/folketinget.py @@ -16,6 +16,7 @@ class FolketingetIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?ft\.dk/webtv/video/[^?#]*?\.(?P<id>[0-9]+)\.aspx' _TEST = { 'url': 'http://www.ft.dk/webtv/video/20141/eru/td.1165642.aspx?as=1#player', + 'md5': '6269e8626fa1a891bf5369b386ae996a', 'info_dict': { 'id': '1165642', 'ext': 'mp4', @@ -29,9 +30,6 @@ class FolketingetIE(InfoExtractor): 'upload_date': '20141120', 'duration': 3960, }, - 'params': { - 'skip_download': 'rtmpdump required', - } } def _real_extract(self, url): |