diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 39553e2e5..9611f9ac9 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -51,7 +51,10 @@ class FunnyOrDieIE(InfoExtractor): formats = [] - bitrates = [int(bitrate) for bitrate in re.findall(r'v(\d+)[,/]', m3u8_url)] + formats.extend(self._extract_m3u8_formats( + m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) + + bitrates = [int(bitrate) for bitrate in re.findall(r'[,/]v(\d+)[,/]', m3u8_url)] bitrates.sort() for bitrate in bitrates: @@ -62,11 +65,6 @@ class FunnyOrDieIE(InfoExtractor): 'vbr': bitrate, }) - self._check_formats(formats, video_id) - - formats.extend(self._extract_m3u8_formats( - m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) - subtitles = {} for src, src_lang in re.findall(r'