diff mbox series

[FFmpeg-devel] fftools/ffmpeg_mux_init: Use all metadata selectors if none is specified.

Message ID 20230315183037.74862-1-thilo.borgmann@mail.de
State New
Headers show
Series [FFmpeg-devel] fftools/ffmpeg_mux_init: Use all metadata selectors if none is specified. | 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

Thilo Borgmann March 15, 2023, 6:30 p.m. UTC 
Fixes regression from 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.
Fixes ticket #10157.
---
 fftools/ffmpeg_mux_init.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Stefano Sabatini March 20, 2023, 10:35 p.m. UTC | #1 
On date Wednesday 2023-03-15 19:30:37 +0100, Thilo Borgmann wrote:
> Fixes regression from 3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f.
> Fixes ticket #10157.
> ---
>  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 b3cc502fdd..deb09666bb 100644
> --- a/fftools/ffmpeg_mux_init.c
> +++ b/fftools/ffmpeg_mux_init.c
> @@ -1819,11 +1819,11 @@ static int copy_metadata(Muxer *mux, AVFormatContext *ic,
>      parse_meta_type(mux, inspec,  &type_in,  &idx_in,  &istream_spec);
>      parse_meta_type(mux, outspec, &type_out, &idx_out, &ostream_spec);
>  
> -    if (type_in == 'g' || type_out == 'g')
> +    if (type_in == 'g' || type_out == 'g' || !*outspec)
>          *metadata_global_manual = 1;
> -    if (type_in == 's' || type_out == 's')
> +    if (type_in == 's' || type_out == 's' || !*outspec)
>          *metadata_streams_manual = 1;
> -    if (type_in == 'c' || type_out == 'c')
> +    if (type_in == 'c' || type_out == 'c' || !*outspec)
>          *metadata_chapters_manual = 1;

LGTM.

Note: cannot reach trac at the moment.
diff mbox series

Patch

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index b3cc502fdd..deb09666bb 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1819,11 +1819,11 @@  static int copy_metadata(Muxer *mux, AVFormatContext *ic,
     parse_meta_type(mux, inspec,  &type_in,  &idx_in,  &istream_spec);
     parse_meta_type(mux, outspec, &type_out, &idx_out, &ostream_spec);
 
-    if (type_in == 'g' || type_out == 'g')
+    if (type_in == 'g' || type_out == 'g' || !*outspec)
         *metadata_global_manual = 1;
-    if (type_in == 's' || type_out == 's')
+    if (type_in == 's' || type_out == 's' || !*outspec)
         *metadata_streams_manual = 1;
-    if (type_in == 'c' || type_out == 'c')
+    if (type_in == 'c' || type_out == 'c' || !*outspec)
         *metadata_chapters_manual = 1;
 
     /* ic is NULL when just disabling automatic mappings */