Bläddra i källkod

Don't embed subtitles if the list is empty or the field is not set (fixes #1510)

Jaime Marquínez Ferrándiz 12 år sedan
förälder
incheckning
74bab3f0a4
1 ändrade filer med 4 tillägg och 1 borttagningar
  1. 4 1
      youtube_dl/PostProcessor.py

+ 4 - 1
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]