aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/PostProcessor.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-09-27 13:09:58 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-09-27 13:09:58 +0200
commitc53f9d30c8cba58d0f3d728eb5b1e05c197d60b6 (patch)
tree8536d6cdc25fdc5d93405ccc9ce4a62c631097b3 /youtube_dl/PostProcessor.py
parent509f398292ff4b9dffecd3a85cd02b4922319b13 (diff)
parent74bab3f0a4b601a7618f279afbd352bbc51dc3ce (diff)
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl/PostProcessor.py')
-rw-r--r--youtube_dl/PostProcessor.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index ae56d2082..3ee1d3c58 100644
--- 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]