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] [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,