From patchwork Wed Mar 15 18:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 40688 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3649819pzb; Wed, 15 Mar 2023 11:30:51 -0700 (PDT) X-Google-Smtp-Source: AK7set/Cl1AWZrKu6trBjjtNiqLsQ6iP0nOlsOtCrvFdcU1dpnzDu62n+ILd4V/UmB7KOR1GLnnM X-Received: by 2002:a17:907:7631:b0:900:a150:cea4 with SMTP id jy17-20020a170907763100b00900a150cea4mr6620928ejc.37.1678905051149; Wed, 15 Mar 2023 11:30:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678905051; cv=none; d=google.com; s=arc-20160816; b=s4bzRzC1OpOkjzYrvo2kxaU/tHTCUKXiCN4thsIugQl25kFMD6v1nrd/uonFuzdf6b UVNtwa+qfodf8eDyXArj4IyvV5sNkNPB9aQE6Ab39/rjumLMgnAapmImdT8i5XJIIaBp OpJvPaHQ7HTmIUslU1noa5PY4FTF8/Xf4HpPYfWevctE3Rdx44n/x1ZZlhgqkzTsnrhb fx9kyKc3D1L7trOzrClzVpn0kJ/FFs8QGcGtqYDpwoVtKsRcDYDxLxU+MvwoGyS1X4Xn GnFQMvrUOJE1t3s4Uxx3RjBRu47XQdA+8kbO/UIQYeobzBPixBZCgKpdnac0fOEMHbku hTag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2m6/bYCGkmQQwBl39R+YkhpEj/lV8sxll1Kc1ex0MZM=; b=jn6rV/p1Z1H8EQkVXKbOnl4N53j9LAkdraLL5vVc5ObttQzIlr2+mWYScVhP1vaNqS dsz6RSXmPuIk/awJuxtF3biiO7N+SsBCgQmOAyi01giMVBwP6SINzeD7cFdzwMKIdnFR aosgOzWUsJYjYx2JgwovkGSSxgemE4tfQWInnWJxBrnVjJbp/AJ2Izp0APY9ojqabL4T NldLfykTWJVbBUYwkq1tEFlQfXXw5kEzjQSMhoAnin1zf7scxchImqKKNkBg5BKXck2D lfEKBv/ygzB1Qaq5g3t96ZVcbu96Mwg3CNKf+Y6p3+BdIPMvmG7eEu+5kwm83s95nlME 0ffQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b="WsRknDm/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n25-20020aa7db59000000b004ad7c7c307bsi4477304edt.567.2023.03.15.11.30.50; Wed, 15 Mar 2023 11:30:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b="WsRknDm/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 894B368AEB9; Wed, 15 Mar 2023 20:30:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A45AF68B076 for ; Wed, 15 Mar 2023 20:30:40 +0200 (EET) Received: from postfix03.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout01.mail.de (Postfix) with ESMTP id 16A81A0372 for ; Wed, 15 Mar 2023 19:30:39 +0100 (CET) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix03.mail.de (Postfix) with ESMTP id EF36C801F5 for ; Wed, 15 Mar 2023 19:30:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1678905039; bh=aEIv9X2LGS2ObafEGudsi8ENadWCyDHojDX8wC9qrcY=; h=From:To:Subject:Date:Message-Id:From:To:CC:Subject:Reply-To; b=WsRknDm/JSQcWB2fZqW/N5F96/vZz11PX11sJZN3OB0x78xqYWe6PosZILOhThiGm flJUCVYhf7J53UUfxiqBmd4mXbygcMLVOy3qnjLt5P+qHHlqcL2xfG3TqHB3Ele1hf hH71Wl2rcx3XY0rT0rW3SZQVbRFtjGh4eqF+FMSZ8PB26Cds6S2uh5mwGVvNWdW+Ez 481+Hf9bs4MIyUbkid+8IMtoQE6J2WmIHq1B1J1I8hAhKl9yo+dBB/zaUFwC4OZYRZ JU3+77Kh4sd4RQkpQXRAma+pd6/T6qO+DZvKHIu10+C4aQaLvGQqcrb/m8mVnJgnFT ZeUq7WsEto9BA== 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 AFE90C016A for ; Wed, 15 Mar 2023 19:30:38 +0100 (CET) From: Thilo Borgmann To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Mar 2023 19:30:37 +0100 Message-Id: <20230315183037.74862-1-thilo.borgmann@mail.de> MIME-Version: 1.0 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: 1113 X-purgate-ID: 154282::1678905038-B57FCC09-FF197EC4/0/0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qmJCwJT3SHRC 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 */