commit c8805576667f316b34f0a9a81d32da7d24dc754c
parent 85689a531f1ba418570ce2bcde6fe16a482a5685
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 3 Jan 2014 13:10:00 +0100
Merge remote-tracking branch 'origin/master'
Diffstat:
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
@@ -10,6 +10,7 @@ from .utils import (
PostProcessingError,
shell_quote,
subtitles_filename,
+ prepend_extension,
)
@@ -496,13 +497,11 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
return True, info
filename = info['filepath']
- ext = os.path.splitext(filename)[1][1:]
- temp_filename = filename + u'.temp'
+ temp_filename = prepend_extension(filename, 'temp')
options = ['-c', 'copy']
for (name, value) in metadata.items():
options.extend(['-metadata', '%s=%s' % (name, value)])
- options.extend(['-f', ext])
self._downloader.to_screen(u'[ffmpeg] Adding metadata to \'%s\'' % filename)
self.run_ffmpeg(filename, temp_filename, options)
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -1119,3 +1119,8 @@ def parse_duration(s):
if m.group('hours'):
res += int(m.group('hours')) * 60 * 60
return res
+
+
+def prepend_extension(filename, ext):
+ name, real_ext = os.path.splitext(filename)
+ return u'{0}.{1}{2}'.format(name, ext, real_ext)