From 330b8305c1cd4e3095c048e2fc82bb75d28bd5e1 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 30 Oct 2023 10:55:36 +0100 Subject: [PATCH] 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 (cherry picked from commit 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc) --- fftools/ffmpeg_mux_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index e42d5ff26a..ceadb93545 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1822,11 +1822,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic, parse_meta_type(mux, inspec, &type_in, &idx_in, &istream_spec); parse_meta_type(mux, outspec, &type_out, &idx_out, &ostream_spec); - if (type_in == 'g' || type_out == 'g') + if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic)) *metadata_global_manual = 1; - if (type_in == 's' || type_out == 's') + if (type_in == 's' || type_out == 's' || (!*outspec && !ic)) *metadata_streams_manual = 1; - if (type_in == 'c' || type_out == 'c') + if (type_in == 'c' || type_out == 'c' || (!*outspec && !ic)) *metadata_chapters_manual = 1; /* ic is NULL when just disabling automatic mappings */