diff options
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 22 | 
1 files changed, 6 insertions, 16 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 1c233f038..a2b0298ec 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -991,19 +991,6 @@ class GenericIE(InfoExtractor):                  'title': 'Os Guinness // Is It Fools Talk? // Unbelievable? Conference 2014',              },          }, -        # Kaltura embed protected with referrer -        { -            'url': 'http://www.disney.nl/disney-channel/filmpjes/achter-de-schermen#/videoId/violetta-achter-de-schermen-ruggero', -            'info_dict': { -                'id': '1_g4fbemnq', -                'ext': 'mp4', -                'title': 'Violetta - Achter De Schermen - Ruggero', -                'description': 'Achter de schermen met Ruggero', -                'timestamp': 1435133761, -                'upload_date': '20150624', -                'uploader_id': 'echojecka', -            }, -        },          # Kaltura embed with single quotes          {              'url': 'http://fod.infobase.com/p_ViewPlaylist.aspx?AssignmentID=NUN8ZY', @@ -2350,8 +2337,9 @@ class GenericIE(InfoExtractor):                  'Channel': 'channel',                  'ChannelList': 'channel_list',              } -            return self.url_result('limelight:%s:%s' % ( -                lm[mobj.group(1)], mobj.group(2)), 'Limelight%s' % mobj.group(1), mobj.group(2)) +            return self.url_result(smuggle_url('limelight:%s:%s' % ( +                lm[mobj.group(1)], mobj.group(2)), {'source_url': url}), +                'Limelight%s' % mobj.group(1), mobj.group(2))          mobj = re.search(              r'''(?sx) @@ -2361,7 +2349,9 @@ class GenericIE(InfoExtractor):                          value=(["\'])(?:(?!\3).)*mediaId=(?P<id>[a-z0-9]{32})              ''', webpage)          if mobj: -            return self.url_result('limelight:media:%s' % mobj.group('id')) +            return self.url_result(smuggle_url( +                'limelight:media:%s' % mobj.group('id'), +                {'source_url': url}), 'LimelightMedia', mobj.group('id'))          # Look for AdobeTVVideo embeds          mobj = re.search(  | 
