diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-30 14:12:41 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-30 14:12:41 +0200 |
| commit | 0c13f378de5f77c31a7df6d6deaec990bd3379d9 (patch) | |
| tree | 7824fca9c1c041142919b53d72d69dc39d075cf2 | |
| parent | 0049594efb3141cedd1373a47f9016b5588e8dd9 (diff) | |
| parent | 113c7d3eb055b0ebf2b56c661c037a63368b9626 (diff) | |
| download | youtube-dl-0c13f378de5f77c31a7df6d6deaec990bd3379d9.tar.xz | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | youtube_dl/extractor/canalplus.py | 2 | ||||
| -rw-r--r-- | youtube_dl/extractor/nrk.py | 4 | ||||
| -rw-r--r-- | youtube_dl/extractor/scivee.py | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dl/extractor/canalplus.py index a67aed027..4f66124fd 100644 --- a/youtube_dl/extractor/canalplus.py +++ b/youtube_dl/extractor/canalplus.py @@ -14,7 +14,7 @@ class CanalplusIE(InfoExtractor): _TEST = { 'url': 'http://www.canalplus.fr/c-infos-documentaires/pid1830-c-zapping.html?vid=922470', - 'md5': '60c29434a416a83c15dae2587d47027d', + 'md5': '3db39fb48b9685438ecf33a1078023e4', 'info_dict': { 'id': '922470', 'ext': 'flv', diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py index a331a7702..e6d68b836 100644 --- a/youtube_dl/extractor/nrk.py +++ b/youtube_dl/extractor/nrk.py @@ -13,7 +13,7 @@ class NRKIE(InfoExtractor): _TESTS = [ { 'url': 'http://www.nrk.no/video/dompap_og_andre_fugler_i_piip_show/D0FA54B5C8B6CE59/emne/piipshow/', - 'md5': '12618eef328c9a35c1b47d5583d9c30d', + 'md5': 'a6eac35052f3b242bb6bb7f43aed5886', 'info_dict': { 'id': '150533', 'ext': 'flv', @@ -23,7 +23,7 @@ class NRKIE(InfoExtractor): }, { 'url': 'http://www.nrk.no/lyd/lyd_av_oppleser_for_blinde/AEFDDD5473BA0198/', - 'md5': '390b2ce15c0d6aa376ef5059ac9f865e', + 'md5': '3471f2a51718195164e88f46bf427668', 'info_dict': { 'id': '154915', 'ext': 'flv', diff --git a/youtube_dl/extractor/scivee.py b/youtube_dl/extractor/scivee.py index 33a78759a..55a481cc0 100644 --- a/youtube_dl/extractor/scivee.py +++ b/youtube_dl/extractor/scivee.py @@ -11,17 +11,13 @@ class SciVeeIE(InfoExtractor): _TEST = { 'url': 'http://www.scivee.tv/node/62352', - #'md5': 'b16699b74c9e6a120f6772a44960304f', + 'md5': 'b16699b74c9e6a120f6772a44960304f', 'info_dict': { 'id': '62352', 'ext': 'mp4', 'title': 'Adam Arkin at the 2014 DOE JGI Genomics of Energy & Environment Meeting', 'description': 'md5:81f1710638e11a481358fab1b11059d7', }, - 'params': { - # Range HTTP header is ignored - 'skip_download': True, - }, } def _real_extract(self, url): |