diff options
| author | Tom-Oliver Heidel <blackjack4494@web.de> | 2020-09-14 13:04:24 +0200 |
|---|---|---|
| committer | Tom-Oliver Heidel <blackjack4494@web.de> | 2020-09-14 13:04:24 +0200 |
| commit | acdb1a4ec627c6ddd976b69c25ebf87fd983ee67 (patch) | |
| tree | f00ef2eade2e7e4a4ad5f223784d5fcaa450af65 /youtube_dlc/postprocessor | |
| parent | 1985f657e5df8529444d7f3b6726b07bae202506 (diff) | |
| parent | d03cfdce1bce28284fa0f168d5d278caacd2fa0b (diff) | |
| download | hypervideo-pre-acdb1a4ec627c6ddd976b69c25ebf87fd983ee67.tar.lz hypervideo-pre-acdb1a4ec627c6ddd976b69c25ebf87fd983ee67.tar.xz hypervideo-pre-acdb1a4ec627c6ddd976b69c25ebf87fd983ee67.zip | |
Merge branch 'arbitrary-merges' of https://github.com/fstirlitz/youtube-dlc
Diffstat (limited to 'youtube_dlc/postprocessor')
| -rw-r--r-- | youtube_dlc/postprocessor/ffmpeg.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/youtube_dlc/postprocessor/ffmpeg.py b/youtube_dlc/postprocessor/ffmpeg.py index dbc736c50..5d66a69a6 100644 --- a/youtube_dlc/postprocessor/ffmpeg.py +++ b/youtube_dlc/postprocessor/ffmpeg.py @@ -476,7 +476,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') in_filenames = [filename] - options = [] + options = ['-map', '0'] if info['ext'] == 'm4a': options.extend(['-vn', '-acodec', 'copy']) @@ -518,7 +518,12 @@ class FFmpegMergerPP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') - args = ['-c', 'copy', '-map', '0:v:0', '-map', '1:a:0'] + args = ['-c', 'copy'] + for (i, fmt) in enumerate(info['requested_formats']): + if fmt.get('acodec') != 'none': + args.extend(['-map', '%u:a:0' % (i)]) + if fmt.get('vcodec') != 'none': + args.extend(['-map', '%u:v:0' % (i)]) self._downloader.to_screen('[ffmpeg] Merging formats into "%s"' % filename) self.run_ffmpeg_multiple_files(info['__files_to_merge'], temp_filename, args) os.rename(encodeFilename(temp_filename), encodeFilename(filename)) |