diff options
| author | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
|---|---|---|
| committer | rzhxeo <rzhxeot7z81b4700@mailcatch.com> | 2013-11-18 00:27:06 +0100 |
| commit | 2b35c9ef742bf261078ea10c6c0bba848db1a0df (patch) | |
| tree | fe80c838c7529c8cab6f1b44d730a2849cd68c48 /youtube_dl/extractor/slashdot.py | |
| parent | 4894fe8c5baec8b1f21ac6fdebe08175abc7f094 (diff) | |
| parent | 73c566695fac926e7e9e6922fe4e6d82c64a1850 (diff) | |
Merge branch 'master' into rtmpdump
Conflicts:
youtube_dl/FileDownloader.py
Merge
Diffstat (limited to 'youtube_dl/extractor/slashdot.py')
| -rw-r--r-- | youtube_dl/extractor/slashdot.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/extractor/slashdot.py b/youtube_dl/extractor/slashdot.py index 2cba53076..f5003c7f9 100644 --- a/youtube_dl/extractor/slashdot.py +++ b/youtube_dl/extractor/slashdot.py @@ -7,6 +7,7 @@ class SlashdotIE(InfoExtractor): _VALID_URL = r'https?://tv.slashdot.org/video/\?embed=(?P<id>.*?)(&|$)' _TEST = { + u'add_ie': ['Ooyala'], u'url': u'http://tv.slashdot.org/video/?embed=JscHMzZDplD0p-yNLOzTfzC3Q3xzJaUz', u'file': u'JscHMzZDplD0p-yNLOzTfzC3Q3xzJaUz.mp4', u'md5': u'd2222e7a4a4c1541b3e0cf732fb26735', |