summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-01-16 13:29:01 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-01-16 13:29:01 +0100
commite205db3bcd7f7a9b0beaa13a4774bdcb26091e2f (patch)
tree8568c10138399a33656949157d263ef8674149b4
parent31d4a6e2121ab5954aec5cfb48d6b1f1cbffefbd (diff)
downloadyoutube-dl-e205db3bcd7f7a9b0beaa13a4774bdcb26091e2f.tar.gz
youtube-dl-e205db3bcd7f7a9b0beaa13a4774bdcb26091e2f.tar.xz
youtube-dl-e205db3bcd7f7a9b0beaa13a4774bdcb26091e2f.zip
FFmpegEmbedSubtitlePP: don't fail if the video doesn't have an audio stream (fixes #4718)
Instead of specifying which streams ffmpeg must copy, we tell it to copy all.
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 26b99e43c..a75277778 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -475,7 +475,13 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
         filename = information['filepath']
         input_files = [filename] + [subtitles_filename(filename, lang, self._subformat) for lang in sub_langs]
 
-        opts = ['-map', '0:0', '-map', '0:1', '-c:v', 'copy', '-c:a', 'copy']
+        opts = [
+            '-map', '0',
+            '-c', 'copy',
+            # Don't copy the existing subtitles, we may be running the
+            # postprocessor a second time
+            '-map', '-0:s',
+        ]
         for (i, lang) in enumerate(sub_langs):
             opts.extend(['-map', '%d:0' % (i + 1), '-c:s:%d' % i, 'mov_text'])
             lang_code = self._conver_lang_code(lang)