From a80949fbfdc5334dd313ca3331610ebb4e6976bd Mon Sep 17 00:00:00 2001
From: Andy Savicki <lao.lav@gmail.com>
Date: Sat, 19 Nov 2016 20:06:10 +0300
Subject: [PATCH] [ruleporn] Undo related changes (funnyordie) for PR #11207

---
 youtube_dl/extractor/funnyordie.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
             subtitles[src_lang] = [{
@@ -80,9 +78,9 @@ class FunnyOrDieIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': post.get('name'),
+            'title': post['name'],
             'description': post.get('description'),
             'thumbnail': post.get('picture'),
             'formats': formats,
             'subtitles': subtitles,
-        }
+        }
\ No newline at end of file