mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-12 08:39:29 -04:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c880557666
@ -10,6 +10,7 @@ from .utils import (
|
|||||||
PostProcessingError,
|
PostProcessingError,
|
||||||
shell_quote,
|
shell_quote,
|
||||||
subtitles_filename,
|
subtitles_filename,
|
||||||
|
prepend_extension,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -496,13 +497,11 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
|
|||||||
return True, info
|
return True, info
|
||||||
|
|
||||||
filename = info['filepath']
|
filename = info['filepath']
|
||||||
ext = os.path.splitext(filename)[1][1:]
|
temp_filename = prepend_extension(filename, 'temp')
|
||||||
temp_filename = filename + u'.temp'
|
|
||||||
|
|
||||||
options = ['-c', 'copy']
|
options = ['-c', 'copy']
|
||||||
for (name, value) in metadata.items():
|
for (name, value) in metadata.items():
|
||||||
options.extend(['-metadata', '%s=%s' % (name, value)])
|
options.extend(['-metadata', '%s=%s' % (name, value)])
|
||||||
options.extend(['-f', ext])
|
|
||||||
|
|
||||||
self._downloader.to_screen(u'[ffmpeg] Adding metadata to \'%s\'' % filename)
|
self._downloader.to_screen(u'[ffmpeg] Adding metadata to \'%s\'' % filename)
|
||||||
self.run_ffmpeg(filename, temp_filename, options)
|
self.run_ffmpeg(filename, temp_filename, options)
|
||||||
|
@ -1119,3 +1119,8 @@ def parse_duration(s):
|
|||||||
if m.group('hours'):
|
if m.group('hours'):
|
||||||
res += int(m.group('hours')) * 60 * 60
|
res += int(m.group('hours')) * 60 * 60
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def prepend_extension(filename, ext):
|
||||||
|
name, real_ext = os.path.splitext(filename)
|
||||||
|
return u'{0}.{1}{2}'.format(name, ext, real_ext)
|
||||||
|
Loading…
Reference in New Issue
Block a user