mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 00:57:07 -05:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master'
This commit is contained in:
		@@ -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',
 | 
			
		||||
 
 | 
			
		||||
@@ -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',
 | 
			
		||||
 
 | 
			
		||||
@@ -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):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user