From b77c70119b53bce726a832d4febf5f24aa7c6314 Mon Sep 17 00:00:00 2001
From: Andy Savicki <lao.lav@gmail.com>
Date: Wed, 16 Nov 2016 02:37:28 +0300
Subject: [PATCH 1/3] [funnyordie] Improve bitrate regex, add _check_formats
 call for video URLs (some .webm urls, not all, return 403 error)

---
 youtube_dl/extractor/funnyordie.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 8c5ffc9e8..39553e2e5 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -51,10 +51,7 @@ class FunnyOrDieIE(InfoExtractor):
 
         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 = [int(bitrate) for bitrate in re.findall(r'v(\d+)[,/]', m3u8_url)]
         bitrates.sort()
 
         for bitrate in bitrates:
@@ -65,6 +62,11 @@ 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] = [{
@@ -78,7 +80,7 @@ class FunnyOrDieIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': post['name'],
+            'title': post.get('name'),
             'description': post.get('description'),
             'thumbnail': post.get('picture'),
             'formats': formats,

From cd1a8de2b6088ba879bb5c371a76ea11e2abe5e1 Mon Sep 17 00:00:00 2001
From: Andy Savicki <lao.lav@gmail.com>
Date: Thu, 17 Nov 2016 02:26:56 +0300
Subject: [PATCH 2/3] [funnyordie] Commit requested changes for pull request
 #11208

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

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 39553e2e5..5bc321ab9 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -11,7 +11,7 @@ class FunnyOrDieIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?funnyordie\.com/(?P<type>embed|articles|videos)/(?P<id>[0-9a-f]+)(?:$|[?#/])'
     _TESTS = [{
         'url': 'http://www.funnyordie.com/videos/0732f586d7/heart-shaped-box-literal-video-version',
-        'md5': 'bcd81e0c4f26189ee09be362ad6e6ba9',
+        'md5': 'c26b9ee0e1ca138c12071f59572ba9c7',
         'info_dict': {
             'id': '0732f586d7',
             'ext': 'mp4',
@@ -51,7 +51,7 @@ class FunnyOrDieIE(InfoExtractor):
 
         formats = []
 
-        bitrates = [int(bitrate) for bitrate in re.findall(r'v(\d+)[,/]', m3u8_url)]
+        bitrates = [int(bitrate) for bitrate in re.findall(r'v(\d+)(?=,|/)', m3u8_url)]
         bitrates.sort()
 
         for bitrate in bitrates:
@@ -80,7 +80,7 @@ class FunnyOrDieIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': post.get('name'),
+            'title': post['name'],
             'description': post.get('description'),
             'thumbnail': post.get('picture'),
             'formats': formats,

From 42eb04cbc8804cb3486350195d70d45068159422 Mon Sep 17 00:00:00 2001
From: Andy Savicki <lao.lav@gmail.com>
Date: Sat, 19 Nov 2016 19:34:59 +0300
Subject: [PATCH 3/3] [funnyordie] More changes for PR #11208

---
 youtube_dl/extractor/funnyordie.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index 5bc321ab9..7664dd584 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -51,7 +51,7 @@ class FunnyOrDieIE(InfoExtractor):
 
         formats = []
 
-        bitrates = [int(bitrate) for bitrate in re.findall(r'v(\d+)(?=,|/)', m3u8_url)]
+        bitrates = [int(bitrate) for bitrate in re.findall(r'[,/]v(\d+)(?=[,/])', m3u8_url)]
         bitrates.sort()
 
         for bitrate in bitrates: