diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-10-30 10:55:36 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-11-02 13:24:21 +0100 |
| commit | 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc (patch) | |
| tree | 7adda1223d174f0ba71b71a0477c0026467f9b02 | |
| parent | 4dbfb52230c4993e58598386ac79b964589dc00e (diff) | |
| download | ffmpeg-02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc.tar.gz | |
fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata
Fixes ticket #10638 (and should also fix ticket #10482)
by restoring the behaviour from before
3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | fftools/ffmpeg_mux_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ab2d1d89e4..63a25a350f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2182,11 +2182,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, if (ret < 0) return ret; - if (type_in == 'g' || type_out == 'g' || !*outspec) + if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; - if (type_in == 's' || type_out == 's' || !*outspec) + if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; - if (type_in == 'c' || type_out == 'c' || !*outspec) + if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */ |