Fixes ticket #10638 and restores the behaviour from before
3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
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 */
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
