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

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

[Thilo Borgmann]

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;
 
     /* ic is NULL when just disabling automatic mappings */
-- 
2.37.1 (Apple Git-137.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-request@ffmpeg.org with subject "unsubscribe".

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

[Stefano Sabatini]

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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

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

[Thilo Borgmann]

Am 20.03.23 um 23:35 schrieb Stefano Sabatini:
> 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.

Pushed, Thanks!

> Note: cannot reach trac at the moment.

Updated #10157, so seems to work atm.

-Thilo
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".