commit 767ff0a2d19a162edc5ea2d33e82ddb30ae244c8
parent 8604e882a8f99fcd632efbb94e449477d860218d
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 25 Jan 2015 05:30:47 +0100
Merge branch 'travis-rtmp'
Diffstat:
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git 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
@@ -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):