aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/funnyordie.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
committerSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
commit7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch)
treecdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/funnyordie.py
parent39d60b715a75e92d169167876bb07424301c0b67 (diff)
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/funnyordie.py')
-rw-r--r--youtube_dl/extractor/funnyordie.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 7f21d7410..4c4a87e2a 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -51,10 +51,8 @@ class FunnyOrDieIE(InfoExtractor):
formats = []
- m3u8_formats = self._extract_m3u8_formats(
- m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
- if m3u8_formats:
- formats.extend(m3u8_formats)
+ 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()