From patchwork Thu Aug 12 17:12:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp952520iod; Thu, 12 Aug 2021 10:13:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjB3Hiy5b96Mw7seGuNSZDTLqYUANcgcZAZmmm8HT0lDAZYcAriw7fY6i6yOP0hSLFOxSd X-Received: by 2002:a17:906:38db:: with SMTP id r27mr4837761ejd.338.1628788425487; Thu, 12 Aug 2021 10:13:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb6si436576edb.399.2021.08.12.10.13.45; Thu, 12 Aug 2021 10:13:45 -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=@outlook.com header.s=selector1 header.b=gPY8Nfmo; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A81B680CEF; Thu, 12 Aug 2021 20:13:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073060.outbound.protection.outlook.com [40.92.73.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D08D8680CEF for ; Thu, 12 Aug 2021 20:13:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IUjj8XlL/FDZ/X9FF4yb+fRMx6QioHh1t9p7kbcA2cMNJXz0/AgxZSeL3Dg/ITLDBnwFgT97KlGSclH8Y7Dnjjbi8RTkKHvmJhCRLA8QsD4roj/lJ63a1ugULvAEo00Tp/ewTO8PyyqnfwPEzjDLHp+6FdoA7BB3qrhh6BmV7XMSSlIgLJtH08REQY1C1wMlKdI3x7qP3oMseqAoZZGF2VPFnCfxY3CXzxeT+ryfxRcC/dcZRCc9x0R4g29w54aYLRTTb9ZQXj7rX7CUcM1M/wSnFISkZJ1Rw9XfQhkQeViDVqNlNbnT7G79A5ZIHO3xNvc9h50ITiE8GEqpkngQ0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhkJ6zFCpvgqinzZVr02a8bvV45z46DzMt0dEhbDPqM=; b=kZbhI8v3bXvWbSrUhgvCu1RUkIG8PWmmRhaLuG+BEtbfRbjjjYme/MFQYwhD7QXJ4XU70DVKvJxHoyYiSlncYzTkPH2lAYiVpaHWtrN3bi6C3Cfg2JB2a7oHrpa9QeaxCGnPLyTkZ8ie1N4AK0foHui++yJ338LdgdRqR6urS5+YCKPrf0J9dxsKVFF8ooFE0e6UqJ74hPEgbCZB1fqPKzfVn45lrqTIX5GyOVbZF1WLkWhWN96iRVhFxSYREUak78DKhQ3QyZ26tC/qdo878rAjEaJcFu4IDoFmPe7j+UHmK102z0CFxMx42QfgEwi2IlAJVWjEyEcyezIW4JGOtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhkJ6zFCpvgqinzZVr02a8bvV45z46DzMt0dEhbDPqM=; b=gPY8NfmoekixKPOjaSC44n67CW2PhCn9mU/AJw8CO6CrRdsrEzzRjk3J8yr7pEI/4V4hZOxUcR8ouYYJ3CNYy74WXD4q//IyGXlDojAKsKuUY5NHTrjDixwJqcze0ZykRWJBU1MWeTurp8ZdfAH4nNOTQ2vrwS2odARsuwi9kieBueKbyzZJuUfwU+Wx5LoVxr8ziWQowfQCRdeVB//79GcZvPGHvz+AFdHFCH9DNqTjnt1Bqu1fMT1sdoTZ69qHjqGcpX7zj9lNKFG7UA2ULtZkrUcKZyfDostCZUgyVuGbdmf1QfueSlhu7+vPJPodYLTu0aFqbFoUS9osQ0xumg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6758.eurprd03.prod.outlook.com (2603:10a6:20b:23e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 17:13:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4415.017; Thu, 12 Aug 2021 17:13:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 19:12:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fBShmj4oyPac3NqZ/nxc1+mLAdn4Ybj5] X-ClientProxiedBy: PR3P192CA0028.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210812171253.1559365-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.93.129) by PR3P192CA0028.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.18 via Frontend Transport; Thu, 12 Aug 2021 17:13:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03db5bb8-f7d2-44a7-fac4-08d95db475c5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUV2AKzJQ6OV+KUMEtXCR7XQQkNUmyYMwSST4QO95RVB7lEabuJDo6jJDXiT7oEQjbPoVAd+i/l56i+/lIOOJs2LznZ49u1XiQqtDWNwZV8n8PV80KP+4EVN4DLrRngdx6D+qJ0ilKXqGHzeQz2LuQNt4oeZ56z3rfEGL+88nA0TdRFu/O63co1M28Uu/KsOpXs5DaUNu/NWCjzMlOEXQOFmtNn07PPEY3DddvG23q8Nen5ImyBTSjKOYNrr7upBMZNcpVGsh4wqm9dleHNROGdJe8WW7oqk5uZ+mSdz3xRMg0Z4+PuKuxzVLxrF6OYtggnEcaU5sqWKlSg5Ug1QWoEFzV3tDDWYgACKPs4/yVMsRgxAw9cRc/eR4YLQP7FnSYo/WvyXSGCP+/NhQGYr/Ud3HKiWutx7KsZHT3w/0IOWHcl7jE+uuQfNMHNjTO0I9NtH4EztDzMG+Vnp/v3jWoya+xpwnaBZqZCGPekSUdZbUD/qz47TC+1fFqzBtfNOLtLTHjmJJcQQg37r4ufVIa3PyZd/iAIzwSWDcRsXdjbxWEBfl38bgwhFv1l7xd4c4ffGbhcCbHxtwmugdJJ8ocxmidlxNXnRcOdiyjZVdEOOQ5Y6cRfI4coFh2yGKeEJuG+Ki6Zhy0LgyWzQ1L/ixAibDGlt1a/Rzhmn02jUv3uKZn2DCcYjTZs00GmI58EX2Uw5mEQGnp4uU4Zu9zqFPpOduscEIlbBLU= X-MS-TrafficTypeDiagnostic: AS8PR03MB6758: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lg51ZW8Qh4OlUMCuMeQVE3uLrihSYY7/Tz8j3FntTKIVsKgWlz88LKznJAvXYYCMPp2GnJCWv55I4l63cYcn7286hjS/z0fKveCmuqMgbdcE1SoTcfJBElcw/W78ecY88EHhxPwPvSFUPlyYEdSxtYJrLTrhgzKPHVeVKJJxHeNi83wuZO+6fNinnWWg2l/o+DCcySh5Ukz4rRzMDg2IOs2iaV0hBYJ8MnCR9l6OImKAl/nju3WwlKRrIsAHc/rz+ybwY8Pws0dOjzd2WBAfZkd/IE5idtYpSmvpP7CA1qNBn5hgnf/h8JEdVdJJ9deuYC+HeSIXO+xxUrNS+D/mRAmHlqzWHoFqEVqntw0/LICQNCaI6OmKF6kNHq+7wP8S6UpgqQRDCL/ex7RhKLHD/Hzg6pB5NVkzsb2qpoZYx12ZB6zhh3KE1vuOhcpQXPi8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pfnXbDU11u4hRECpSvd6UvWBvYds/0GSkHi7lPDHSpjvE+i9GgpozTl3RylBB/6GHZND4ge/+pWzPk6v42VTgQEFNQZRRp8q1Ii1EQylAK8jTUCi5GDJekcwGniGAnwRkh3i4v+8Y6eaBhiuTtn/bA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03db5bb8-f7d2-44a7-fac4-08d95db475c5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 17:13:10.2883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6758 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/avfilter, fftools/cmdutils: Switch to AVFilter.nb_(in|out)puts 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TAil5x9xmXFs Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 6 +++--- libavfilter/avfilter.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 96d38803df..24bcdc6b62 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1713,7 +1713,7 @@ int show_filters(void *optctx, const char *opt, const char *arg) *(descr_cur++) = '>'; } pad = i ? filter->outputs : filter->inputs; - nb_pads = avfilter_pad_count(pad); + nb_pads = i ? filter->nb_outputs : filter->nb_inputs; for (j = 0; j < nb_pads; j++) { if (descr_cur >= descr + sizeof(descr) - 4) break; @@ -1949,7 +1949,7 @@ static void show_help_filter(const char *name) printf(" slice threading supported\n"); printf(" Inputs:\n"); - count = avfilter_pad_count(f->inputs); + count = f->nb_inputs; for (i = 0; i < count; i++) { printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i), media_type_string(avfilter_pad_get_type(f->inputs, i))); @@ -1960,7 +1960,7 @@ static void show_help_filter(const char *name) printf(" none (source filter)\n"); printf(" Outputs:\n"); - count = avfilter_pad_count(f->outputs); + count = f->nb_outputs; for (i = 0; i < count; i++) { printf(" #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i), media_type_string(avfilter_pad_get_type(f->outputs, i))); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 85fbba8080..fc6023a97c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -663,7 +663,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) goto err; ret->internal->execute = default_execute; - ret->nb_inputs = avfilter_pad_count(filter->inputs); + ret->nb_inputs = filter->nb_inputs; if (ret->nb_inputs ) { ret->input_pads = av_memdup(filter->inputs, ret->nb_inputs * sizeof(*filter->inputs)); if (!ret->input_pads) @@ -673,7 +673,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) goto err; } - ret->nb_outputs = avfilter_pad_count(filter->outputs); + ret->nb_outputs = filter->nb_outputs; if (ret->nb_outputs) { ret->output_pads = av_memdup(filter->outputs, ret->nb_outputs * sizeof(*filter->outputs)); if (!ret->output_pads)