From 614a7e1e230e095d9a11b59b20f4ff7462be8b21 Mon Sep 17 00:00:00 2001
From: "PishPosh.McGee" <pishposhmcgee@users.noreply.github.com>
Date: Tue, 10 Mar 2015 15:22:46 -0500
Subject: [PATCH 1/3] Added subtitles for FunnyOrDie

---
 youtube_dl/extractor/funnyordie.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index a49fc1151..f832ac5c3 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -50,7 +50,6 @@ class FunnyOrDieIE(InfoExtractor):
         bitrates.sort()
 
         formats = []
-
         for bitrate in bitrates:
             for link in links:
                 formats.append({
@@ -59,6 +58,16 @@ class FunnyOrDieIE(InfoExtractor):
                     'vbr': bitrate,
                 })
 
+        subtitles={}
+        subtitle_matches=re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage)
+        for match in subtitle_matches:
+          (suburl,sublang)=match
+          if not sublang in subtitles.keys():
+            subtitles[sublang]=[]
+          subext=suburl.split('/')[-1]
+          print subext
+          subtitles[sublang].append({'url': suburl,'ext': subext})
+
         post_json = self._search_regex(
             r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
         post = json.loads(post_json)
@@ -69,4 +78,5 @@ class FunnyOrDieIE(InfoExtractor):
             'description': post.get('description'),
             'thumbnail': post.get('picture'),
             'formats': formats,
+            'subtitles': subtitles,
         }

From 1593194c63acd8dc8aa125edbde443680fabd2f7 Mon Sep 17 00:00:00 2001
From: pishposhmcgee <pishposh.mcgee@gmail.com>
Date: Tue, 10 Mar 2015 15:35:35 -0500
Subject: [PATCH 2/3] Update funnyordie.py

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

diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index f832ac5c3..0a22d99d2 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -65,8 +65,7 @@ class FunnyOrDieIE(InfoExtractor):
           if not sublang in subtitles.keys():
             subtitles[sublang]=[]
           subext=suburl.split('/')[-1]
-          print subext
-          subtitles[sublang].append({'url': suburl,'ext': subext})
+          subtitles[sublang].append({'url': 'http://www.funnyordie.com'+suburl,'ext': subext})
 
         post_json = self._search_regex(
             r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')

From a3fbd188241b6151b024f6e3ea21c0edc60fae09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Wed, 11 Mar 2015 21:56:22 +0600
Subject: [PATCH 3/3] [funnyordie] Simplify subtitles

---
 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 0a22d99d2..dd87257c4 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -58,14 +58,12 @@ class FunnyOrDieIE(InfoExtractor):
                     'vbr': bitrate,
                 })
 
-        subtitles={}
-        subtitle_matches=re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage)
-        for match in subtitle_matches:
-          (suburl,sublang)=match
-          if not sublang in subtitles.keys():
-            subtitles[sublang]=[]
-          subext=suburl.split('/')[-1]
-          subtitles[sublang].append({'url': 'http://www.funnyordie.com'+suburl,'ext': subext})
+        subtitles = {}
+        for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
+            subtitles[src_lang] = [{
+                'ext': src.split('/')[-1],
+                'url': 'http://www.funnyordie.com%s' % src,
+            }]
 
         post_json = self._search_regex(
             r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')