From patchwork Thu Aug 19 15:30:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 29617 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp403853iov; Thu, 19 Aug 2021 08:31:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw144F+ryhIO9A5KcCug9LGUs4UYNlvRO+8jYAFuYmYHXxIbMyCBdddOCs1burXRRL9IydT X-Received: by 2002:a17:906:32d6:: with SMTP id k22mr15866410ejk.228.1629387094444; Thu, 19 Aug 2021 08:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629387094; cv=none; d=google.com; s=arc-20160816; b=kWox5D9fvFmop0Pfvr9hsnhVc3cTfUstAE++QU96esF6R9cXNManousSKaArdPg+ps m+SWLFsVzreiG9r5ijZv6tMzVQNnwuvK0bMrB2gDU+qF2XPTEoeHOdmirdybHG04mkWg 0WR5TlZvNTZ5OYGTiOjdXsBDhIDHAX3Py6Qqv5RZXVtn6LtL5aUXxnYwOoz7OodiOR3e vgBslrA7Nos8peDor8Wkuzh/o5xbF6RT3NxTDasopWQQAHskB3LFgh7rlpZ9yqv1ck// uAeKbnIhDcpZ8FSkZMMuWKJiBg9cAGVydoCqOBmY/e29y1d6Mo8DZ9TgYhwjTpjfMBpy vyzQ== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=61DoNLa9Xsl3FGgqcgMUSMoc5tRqG1JmRsbJS5f5s88=; b=J5vNAlCfuye0wqaSRheOaeRhAmFIC0QRY7I7YXAwIr6vqO+7nC4ds0aowg4Mh/MlLO bSKL2pIjcqVsMChD1vz8/fL/KMteCVDBdXH9hA7BASiH1y2hVUW5uLv8e4n9w00dlemh ZV6c/DELDSjp/bZOWTjPdU8e3bC9p6scORY0yF6AVVYzCY2o7uIn3S5I/77AGQAHmu1I zefR7r8jL0BSBfBCN4DWRX0i42+qblDYy1Q4G9xWP1jYPPsuRTrL6DEhdjwfeYxV5nX/ 1BtBSztFh5nzIqME5nfzhWgs7eGQvTOdVVBcxSj86L55dEkflo2C0SYNukNS1NQicdcZ gZaw== ARC-Authentication-Results: i=1; mx.google.com; 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 f9si3438382ejl.743.2021.08.19.08.31.24; Thu, 19 Aug 2021 08:31:34 -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; 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 A571F68A410; Thu, 19 Aug 2021 18:31:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B37E6804F6 for ; Thu, 19 Aug 2021 18:31:02 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 17JFV1sM024262 for ; Thu, 19 Aug 2021 17:31:01 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id 9D53EEB5BC; Thu, 19 Aug 2021 17:31:01 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Aug 2021 17:30:56 +0200 Message-Id: <20210819153057.149696-2-george@nsup.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819153057.149696-1-george@nsup.org> References: <20210819153057.149696-1-george@nsup.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Thu, 19 Aug 2021 17:31:02 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 2/3] lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers 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: x9qTPdM7QioL Signed-off-by: Nicolas George --- libavfilter/avfiltergraph.c | 6 +++--- libavfilter/formats.c | 4 ++-- libavfilter/formats.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 41a91a9bda..8c6d43a0c7 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -465,7 +465,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) neg = ff_filter_get_negotiation(link); av_assert0(neg); - for (neg_step = 1; neg_step < neg->nb; neg_step++) { + for (neg_step = 1; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *a = FF_FIELD_AT(void *, m->offset, link->incfg); void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); @@ -474,7 +474,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) break; } } - for (neg_step = 0; neg_step < neg->nb; neg_step++) { + for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *a = FF_FIELD_AT(void *, m->offset, link->incfg); void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); @@ -542,7 +542,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) av_assert0(outlink-> incfg.channel_layouts->refcount > 0); av_assert0(outlink->outcfg.channel_layouts->refcount > 0); } - for (neg_step = 0; neg_step < neg->nb; neg_step++) { + for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg); void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg); diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 9e39d65a3c..ca85b4094b 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -327,14 +327,14 @@ static const AVFilterFormatsMerger mergers_audio[] = { }; static const AVFilterNegotiation negotiate_video = { - .nb = FF_ARRAY_ELEMS(mergers_video), + .nb_mergers = FF_ARRAY_ELEMS(mergers_video), .mergers = mergers_video, .conversion_filter = "scale", .conversion_opts_offset = offsetof(AVFilterGraph, scale_sws_opts), }; static const AVFilterNegotiation negotiate_audio = { - .nb = FF_ARRAY_ELEMS(mergers_audio), + .nb_mergers = FF_ARRAY_ELEMS(mergers_audio), .mergers = mergers_audio, .conversion_filter = "aresample", .conversion_opts_offset = offsetof(AVFilterGraph, aresample_swr_opts), diff --git a/libavfilter/formats.h b/libavfilter/formats.h index a9cfa14e95..d94977a3aa 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -322,7 +322,7 @@ typedef struct AVFilterFormatMerger { } AVFilterFormatsMerger; typedef struct AVFilterNegotiation { - unsigned nb; + unsigned nb_mergers; const AVFilterFormatsMerger *mergers; const char *conversion_filter; unsigned conversion_opts_offset;