Skip to content

Commit

Permalink
fftools/ffmpeg_mux_init: Restrict disabling automatic copying of meta…
Browse files Browse the repository at this point in the history
…data

Fixes ticket #10638 (and should also fix ticket #10482)
by restoring the behaviour from before
3c7dd5e.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
  • Loading branch information
mkver committed Nov 2, 2023
1 parent 4dbfb52 commit 02064ba
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fftools/ffmpeg_mux_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 02064ba

Please sign in to comment.