diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-03 13:10:00 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-03 13:10:00 +0100 |
| commit | c8805576667f316b34f0a9a81d32da7d24dc754c (patch) | |
| tree | b5d10aab5ae40f9c029c0d578cc1ae60c797f421 | |
| parent | 85689a531f1ba418570ce2bcde6fe16a482a5685 (diff) | |
| parent | 91d7d0b333d2fe09121c7328cf519c1b5331adef (diff) | |
| download | youtube-dl-c8805576667f316b34f0a9a81d32da7d24dc754c.tar.gz youtube-dl-c8805576667f316b34f0a9a81d32da7d24dc754c.tar.xz youtube-dl-c8805576667f316b34f0a9a81d32da7d24dc754c.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | youtube_dl/PostProcessor.py | 5 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index 69aedf87a..097e1a9e4 100644 --- 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 index da5143c8e..fc10fba63 100644 --- 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) |