Merge tag 'upstream/2015.11.10'

[youtubedl] / youtube_dl / extractor / folketinget.py

diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dl/extractor/folketinget.py
index 68e2db94385bc7f51d7f27a68d61d5e4289ba0c9..75399fa7d2a3164c67f2d72c24628a861ed77806 100644 (file)
--- a/youtube_dl/extractor/folketinget.py
+++ b/youtube_dl/extractor/folketinget.py
@@ -16,6 +16,7 @@ class FolketingetIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?ft\.dk/webtv/video/[^?#]*?\.(?P<id>[0-9]+)\.aspx'
     _TEST = {
         'url': 'http://www.ft.dk/webtv/video/20141/eru/td.1165642.aspx?as=1#player',
     _VALID_URL = r'https?://(?:www\.)?ft\.dk/webtv/video/[^?#]*?\.(?P<id>[0-9]+)\.aspx'
     _TEST = {
         'url': 'http://www.ft.dk/webtv/video/20141/eru/td.1165642.aspx?as=1#player',

+        'md5': '6269e8626fa1a891bf5369b386ae996a',

         'info_dict': {
             'id': '1165642',
             'ext': 'mp4',
         'info_dict': {
             'id': '1165642',
             'ext': 'mp4',


@@ -30,8 +31,9 @@ class FolketingetIE(InfoExtractor):
             'duration': 3960,
         },
         'params': {
             'duration': 3960,
         },
         'params': {

-            'skip_download': 'rtmpdump required',
-        }
+            # rtmp download
+            'skip_download': True,
+        },

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):