aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/PostProcessor.py
diff options
context:
space:
mode:
authorrzhxeo <rzhxeo@users.noreply.github.com>2013-09-30 21:39:58 -0700
committerrzhxeo <rzhxeo@users.noreply.github.com>2013-09-30 21:39:58 -0700
commitc0de39e6d42d8de6a77768b2a96570fd8df8ad36 (patch)
treeef10e4ee36c43121490ae5bf89275c1793a30f88 /youtube_dl/PostProcessor.py
parenta921f40799d2ecb4be53b3241d2dbfc80f804d73 (diff)
parent722076a123c60ed6d5a978c4bc2609f46c8e3ee9 (diff)
Merge pull request #2 from rg3/master
Update
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]