[FFmpeg-cvslog] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata

[Andreas Rheinhardt]

ffmpeg | branch: release/6.1 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Oct 30 10:55:36 2023 +0100| [5eca8964a93208ef9c4fac48411ed8fcd8883ea3] | committer: James Almer

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 at outlook.com>
(cherry picked from commit 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eca8964a93208ef9c4fac48411ed8fcd8883ea3
---

 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 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 */