From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 1 Sep 2015 16:37:42 +0000 (+0600)
Subject: [francetv] Use subtitle when present (Closes #6715)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=36c15522c121c0ffeb5208847a4f5461adc4f3b5;p=youtube-dl

[francetv] Use subtitle when present (Closes #6715)
---

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index 75723c00d..c053774b9 100644
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -78,9 +78,14 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
                 })
         self._sort_formats(formats)
 
+        title = info['titre']
+        subtitle = info.get('sous_titre')
+        if subtitle:
+            title += ' - %s' % subtitle
+
         return {
             'id': video_id,
-            'title': info['titre'],
+            'title': title,
             'description': clean_html(info['synopsis']),
             'thumbnail': compat_urlparse.urljoin('http://pluzz.francetv.fr', info['image']),
             'duration': int_or_none(info.get('real_duration')) or parse_duration(info['duree']),