dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'travis-rtmp'

This commit is contained in:
Philipp Hagemeister 2015-01-25 05:30:47 +01:00
parent 8604e882a8 e1ccc04e9f
commit 767ff0a2d1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -4,6 +4,9 @@ python:
- "2.7" - "2.7"
- "3.3" - "3.3"
- "3.4" - "3.4"
before_install:
- sudo apt-get update -qq
- sudo apt-get install -yqq rtmpdump
script: nosetests test --verbose script: nosetests test --verbose
notifications: notifications:
email: email:

4
youtube_dl/extractor/folketinget.py
View File

@ -16,6 +16,7 @@ class FolketingetIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?ft\.dk/webtv/video/[^?#]*?\.(?P<id>[0-9]+)\.aspx' _VALID_URL = r'https?://(?:www\.)?ft\.dk/webtv/video/[^?#]*?\.(?P<id>[0-9]+)\.aspx'
_TEST = { _TEST = {
'url': 'http://www.ft.dk/webtv/video/20141/eru/td.1165642.aspx?as=1#player', 'url': 'http://www.ft.dk/webtv/video/20141/eru/td.1165642.aspx?as=1#player',
'md5': '6269e8626fa1a891bf5369b386ae996a',
'info_dict': { 'info_dict': {
'id': '1165642', 'id': '1165642',
'ext': 'mp4', 'ext': 'mp4',
@ -29,9 +30,6 @@ class FolketingetIE(InfoExtractor):
'upload_date': '20141120', 'upload_date': '20141120',
'duration': 3960, 'duration': 3960,
}, },
'params': {
'skip_download': 'rtmpdump required',
}
} }
def _real_extract(self, url): def _real_extract(self, url):