depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-29 21:52:54 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Philipp Hagemeister 2014-04-30 14:12:41 +02:00
commit 0c13f378de
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/extractor/canalplus.py
View file

@ -14,7 +14,7 @@ class CanalplusIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'http://www.canalplus.fr/c-infos-documentaires/pid1830-c-zapping.html?vid=922470', 'url': 'http://www.canalplus.fr/c-infos-documentaires/pid1830-c-zapping.html?vid=922470',
'md5': '60c29434a416a83c15dae2587d47027d', 'md5': '3db39fb48b9685438ecf33a1078023e4',
'info_dict': { 'info_dict': {
'id': '922470', 'id': '922470',
'ext': 'flv', 'ext': 'flv',

4
youtube_dl/extractor/nrk.py
View file

@ -13,7 +13,7 @@ class NRKIE(InfoExtractor):
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.nrk.no/video/dompap_og_andre_fugler_i_piip_show/D0FA54B5C8B6CE59/emne/piipshow/', 'url': 'http://www.nrk.no/video/dompap_og_andre_fugler_i_piip_show/D0FA54B5C8B6CE59/emne/piipshow/',
'md5': '12618eef328c9a35c1b47d5583d9c30d', 'md5': 'a6eac35052f3b242bb6bb7f43aed5886',
'info_dict': { 'info_dict': {
'id': '150533', 'id': '150533',
'ext': 'flv', 'ext': 'flv',
@ -23,7 +23,7 @@ class NRKIE(InfoExtractor):
}, },
{ {
'url': 'http://www.nrk.no/lyd/lyd_av_oppleser_for_blinde/AEFDDD5473BA0198/', 'url': 'http://www.nrk.no/lyd/lyd_av_oppleser_for_blinde/AEFDDD5473BA0198/',
'md5': '390b2ce15c0d6aa376ef5059ac9f865e', 'md5': '3471f2a51718195164e88f46bf427668',
'info_dict': { 'info_dict': {
'id': '154915', 'id': '154915',
'ext': 'flv', 'ext': 'flv',

6
youtube_dl/extractor/scivee.py
View file

@ -11,17 +11,13 @@ class SciVeeIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'http://www.scivee.tv/node/62352', 'url': 'http://www.scivee.tv/node/62352',
#'md5': 'b16699b74c9e6a120f6772a44960304f', 'md5': 'b16699b74c9e6a120f6772a44960304f',
'info_dict': { 'info_dict': {
'id': '62352', 'id': '62352',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Adam Arkin at the 2014 DOE JGI Genomics of Energy & Environment Meeting', 'title': 'Adam Arkin at the 2014 DOE JGI Genomics of Energy & Environment Meeting',
'description': 'md5:81f1710638e11a481358fab1b11059d7', 'description': 'md5:81f1710638e11a481358fab1b11059d7',
}, },
'params': {
# Range HTTP header is ignored
'skip_download': True,
},
} }
def _real_extract(self, url): def _real_extract(self, url):