]> jfr.im git - yt-dlp.git/commitdiff
Merge branch 'master' into rcs
authorTom-Oliver Heidel <redacted>
Mon, 30 Nov 2020 01:46:10 +0000 (02:46 +0100)
committerGitHub <redacted>
Mon, 30 Nov 2020 01:46:10 +0000 (02:46 +0100)
1  2 
youtube_dlc/extractor/extractors.py
youtube_dlc/extractor/generic.py

Simple merge
index 1641934f488f7628925070627d80f138e8118ab7,7711de01b76fc703d9b2003b50a2baa0a3454e25..74760a180b3b5429360c531cf6d29c7e1080feb8
@@@ -119,7 -120,7 +120,8 @@@ from .expressen import ExpressenI
  from .zype import ZypeIE
  from .odnoklassniki import OdnoklassnikiIE
  from .kinja import KinjaEmbedIE
 +from .rcs import RCSEmbedsIE
+ from .bitchute import BitChuteIE
  
  
  class GenericIE(InfoExtractor):
              return self.playlist_from_matches(
                  zype_urls, video_id, video_title, ie=ZypeIE.ie_key())
  
 +        # Look for RCS media group embeds
 +        rcs_urls = RCSEmbedsIE._extract_urls(webpage)
 +        if rcs_urls:
 +            return self.playlist_from_matches(
 +                rcs_urls, video_id, video_title, ie=RCSEmbedsIE.ie_key())
 +
+         bitchute_urls = BitChuteIE._extract_urls(webpage)
+         if bitchute_urls:
+             return self.playlist_from_matches(
+                 bitchute_urls, video_id, video_title, ie=BitChuteIE.ie_key())
          # Look for HTML5 media
          entries = self._parse_html5_media_entries(url, webpage, video_id, m3u8_id='hls')
          if entries: