From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4A18045829 for ; Sat, 25 Mar 2023 19:40:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C74DF68CA60; Sat, 25 Mar 2023 21:40:00 +0200 (EET) Received: from shout02.mail.de (shout02.mail.de [62.201.172.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DB2268C8BA for ; Sat, 25 Mar 2023 21:39:55 +0200 (EET) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout02.mail.de (Postfix) with ESMTP id 3ACA7A0CA3 for ; Sat, 25 Mar 2023 20:39:54 +0100 (CET) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix02.mail.de (Postfix) with ESMTP id 227A3A03C1 for ; Sat, 25 Mar 2023 20:39:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1679773194; bh=35GrfqUygc+2t8VrtewsQFFDHnc+w3WNI2XIRN0vVyg=; h=Message-ID:Date:Subject:To:From:From:To:CC:Subject:Reply-To; b=dw1z3K0Ub8KuRjCgPRdQZovZ63YISO/lvaOWPQp9sHKsDJCV4cOMRYMmTx2oOaY2K /uIBjbp6s1+PhCFsQjCjhpu8K2Y7NidzFXrJT5wGdqAOYCoSbGVIrYEmrcKfH7eNUg wJwO9DkWnUDwIqF4inaUcfm7hYVoCpIOV4tKYQQ2WX+8CyUVax4uv6iHA8svkA3xu8 J6q8sHWeSuGs9efchiLKi4ORVWw3jo5vDEk8PA29wqqbjQQOKgPwv1d39+gXV7NhuG kDztnWdor5+jnXio87UMBRmh9viuRILZp90PWLgl8YulKpwCBFBPABQRsR+jF7WTnb rW2h+D2hqlZXA== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id DC330C009E for ; Sat, 25 Mar 2023 20:39:53 +0100 (CET) Message-ID: Date: Sat, 25 Mar 2023 20:39:53 +0100 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230315183037.74862-1-thilo.borgmann@mail.de> <20230320223539.GJ48946@mariano> From: Thilo Borgmann In-Reply-To: <20230320223539.GJ48946@mariano> X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 1336 X-purgate-ID: 154282::1679773193-FFFFBC09-55DD2350/0/0 Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: Use all metadata selectors if none is specified. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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".