diff options
| author | Tithen-Firion <Tithen-Firion@users.noreply.github.com> | 2017-05-04 11:00:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 11:00:06 +0200 |
| commit | c89267d31ad99eb5b1a87cd354de5280a2a087b1 (patch) | |
| tree | 8bb3b01cd088d0646089344bddd3d4ff272c0065 /youtube_dl/extractor/funnyordie.py | |
| parent | 7552f96352f35cd877e52fd0770b77ba1856fc62 (diff) | |
| parent | 0c265486016b06342fb257966474ce591667aaff (diff) | |
Merge branch 'master' into openload-phantomjs-method
Diffstat (limited to 'youtube_dl/extractor/funnyordie.py')
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index 81c0ce9a3..49409369c 100644 --- a/youtube_dl/extractor/funnyordie.py +++ b/youtube_dl/extractor/funnyordie.py @@ -58,8 +58,7 @@ class FunnyOrDieIE(InfoExtractor): m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False) source_formats = list(filter( - lambda f: f.get('vcodec') != 'none' and f.get('resolution') != 'multiple', - m3u8_formats)) + lambda f: f.get('vcodec') != 'none', m3u8_formats)) bitrates = [int(bitrate) for bitrate in re.findall(r'[,/]v(\d+)(?=[,/])', m3u8_url)] bitrates.sort() |