RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
3c7dd5ed37.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-10-30 10:55:36 +01:00
parent 4dbfb52230
commit 02064ba3a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fftools/ffmpeg_mux_init.c
View File

@ -2182,11 +2182,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (type_in == 'g' || type_out == 'g' || !*outspec) if (type_in == 'g' || type_out == 'g' || (!*outspec && !ic))
*metadata_global_manual = 1; *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; *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; *metadata_chapters_manual = 1;
/* ic is NULL when just disabling automatic mappings */ /* ic is NULL when just disabling automatic mappings */