youtube-dl

commit: c53f9d30c8cba58d0f3d728eb5b1e05c197d60b6
parent 509f398292ff4b9dffecd3a85cd02b4922319b13
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Fri, 27 Sep 2013 13:09:58 +0200

Merge branch 'master' of github.com:rg3/youtube-dl

Diffstat:
M
youtube_dl/PostProcessor.py
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
@@ -444,8 +444,11 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
         if information['ext'] != u'mp4':
             self._downloader.to_screen(u'[ffmpeg] Subtitles can only be embedded in mp4 files')
             return True, information
-        sub_langs = [key for key in information['subtitles']]
+        if not information.get('subtitles'):
+            self._downloader.to_screen(u'[ffmpeg] There aren\'t any subtitles to embed') 
+            return True, information
 
+        sub_langs = [key for key in information['subtitles']]
         filename = information['filepath']
         input_files = [filename] + [subtitles_filename(filename, lang, self._subformat) for lang in sub_langs]