diff mbox series

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

Message ID AS8P250MB07449A7313F4158D40AE1B9E8FA1A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 02064ba3a37754183cf7e7a4c1ffd3cdf971b5dc
Headers show
Series [FFmpeg-devel] fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Oct. 30, 2023, 10:10 a.m. UTC 
Fixes ticket #10638 and restores the behaviour from before
3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 fftools/ffmpeg_mux_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Andreas Rheinhardt Nov. 1, 2023, 11:21 a.m. UTC | #1 
Andreas Rheinhardt:
> Fixes ticket #10638 and restores the behaviour from before
> 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@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 */

Will apply tomorrow unless there are objections.

- Andreas
diff mbox series

Patch

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