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:37:37 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-01-16 13:37:37 +0100
commit2875cf01bb2229cb6cceeac72fb6dd770f7a96d2 (patch)
treef50eb88b8eaff3cd77d38f8992d63b20080c0aef
parente205db3bcd7f7a9b0beaa13a4774bdcb26091e2f (diff)
downloadyoutube-dl-2875cf01bb2229cb6cceeac72fb6dd770f7a96d2.tar.gz
youtube-dl-2875cf01bb2229cb6cceeac72fb6dd770f7a96d2.tar.xz
youtube-dl-2875cf01bb2229cb6cceeac72fb6dd770f7a96d2.zip
FFmpegEmbedSubtitlePP: simplify command
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index a75277778..5b0ff32b1 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -481,15 +481,15 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
             # Don't copy the existing subtitles, we may be running the
             # postprocessor a second time
             '-map', '-0:s',
+            '-c:s', 'mov_text',
         ]
         for (i, lang) in enumerate(sub_langs):
-            opts.extend(['-map', '%d:0' % (i + 1), '-c:s:%d' % i, 'mov_text'])
+            opts.extend(['-map', '%d:0' % (i + 1)])
             lang_code = self._conver_lang_code(lang)
             if lang_code is not None:
                 opts.extend(['-metadata:s:s:%d' % i, 'language=%s' % lang_code])
-        opts.extend(['-f', 'mp4'])
 
-        temp_filename = filename + '.temp'
+        temp_filename = prepend_extension(filename, 'temp')
         self._downloader.to_screen('[ffmpeg] Embedding subtitles in \'%s\'' % filename)
         self.run_ffmpeg_multiple_files(input_files, temp_filename, opts)
         os.remove(encodeFilename(filename))