From patchwork Sat Sep 11 23:16:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30150 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2744720iov; Sat, 11 Sep 2021 16:17:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhvMJJJvfVSl7p2en9L32n9DGPN54jB318yDxaoI9le3QH/jupoD9+zlGCgSwm4lRSTQlv X-Received: by 2002:aa7:df92:: with SMTP id b18mr5170458edy.47.1631402259646; Sat, 11 Sep 2021 16:17:39 -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 p62si1367167edb.327.2021.09.11.16.17.38; Sat, 11 Sep 2021 16:17:39 -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=bJEGTUVw; 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 C8C2B68A84D; Sun, 12 Sep 2021 02:17:34 +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-oln040092073033.outbound.protection.outlook.com [40.92.73.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F15F68A048 for ; Sun, 12 Sep 2021 02:17:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ImFmM631TrsPJT1/lvtCUG75JaLR4f/dvN00o3VBsZ+euHI9da3HSpJcxoya/ltIBH6ddv0QksXmSFTqTLDBl8x/v6oDqu5J6Syt95fuFnrOLs0+AD+asjJbaN71w9nArs4hqxsHBU+w3YeVkKMbBuOAuqtDoph+ngDge483RhVRf6F3PC3DTQYfVmnqFKxfyp3cWxcN+YyB3iBuKIQGNhK1xSAkOtVz1r+S6fJK4wSpwNJbnLn/YWlBVp0H6yvDtnXCYGhBJO5XXgU39aXZ08SDMH+M07l48ACJzvg7+EXK60M2r82X7cXxlSuE4kHHLLKmJSdHiip9BPT1aDKBKA== 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; bh=XcpR+NkRi1oCUYQo8tM0mhwzswlSWD9Y6HWhpzGZo1o=; b=JNjSi905GFvQTQ6zrJr+RtmfWD64oMYS7BrkfAevecxneV3z/++hPoCcRcJrY1RzEi0gyndQVbxA0T/cPZqHczbHw4NU4zPpy3p0EYcJooQWMifh1csp81qbWCw5fptJUjtmaSkM8FmKi6rI3P3Tjkwn7vRvic+hYqhjrFMuFGaMociMlqeJnHDeAXTc+JW7jUub/rA30Ie4PidIXYuKLHWu+saQmTLdpgSPQV4yICOrySdRpAirF6e929DyZaRLlR9wCSFaIi0lqYEiV6Ph//qF91tZ4egN1DJKy1rjZSccPCNDfWHBIUz9qrcHCFlf7EaYgs5BQxpHckMbACQ6xw== 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=XcpR+NkRi1oCUYQo8tM0mhwzswlSWD9Y6HWhpzGZo1o=; b=bJEGTUVwKXOPMcF0Np7RB+CRVzJWouVmz6mTTuS07orTR2iMN0gAoohgyMNYh9McU48CFzv2boW9R64PPDVLJOMTI/PfCOlyNjs94j1qLMF1ClOVql3v9CU5YQYAZnBIoRv55gNQTva9yzm6VGF9PL/wOJYmdcSVvdWwkSLltyH/e+dWRjcQawTETJvdy0n4IRUIcwqIXo/E/aBga83J7EQj9DE9spV7kwDRmwQ4OmHye2KxMq2duUhw3ZWFEA+k4mk9T6VcvFQTiH9Y1LtpI6jy1UQzwEuTkx5+/a1sx4ib9XFGyrErpJEO8/U9v7TDiJenbyupI/ZQzQdlSkCdog== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3527.eurprd03.prod.outlook.com (2603:10a6:209:2f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Sat, 11 Sep 2021 23:17:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 23:17:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:16:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [lfbUaFHJpBklzDEGvm4Tc4JWt7SDD2Vo] X-ClientProxiedBy: AM4PR0302CA0017.eurprd03.prod.outlook.com (2603:10a6:205:2::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911231716.2236989-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0302CA0017.eurprd03.prod.outlook.com (2603:10a6:205:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:17:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 158903e9-32cc-4be3-363a-08d9757a50e4 X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wol03QlwRVv/lJtRUoBRm3Q9ipj8Cun2r/xh1iRxHHqN4RSpOsr4ISCRbF6VCh6uh8QrK2/CSaghRtXC20wtB8VVkrWZtrVeXDdQGweO7AI1DtYBc9ouaI6Mi1TWeIRgirojZfURJV48bYC5zdPeVxs9H6zueknbIr3idkwhZs+A6276pGzahiEM08oFnpaCv5T8yKyqsa/Zfh0KvehNt+xXcw1pprb2J8hRVJkROaCMrQ1+f9tIJFxbBQbJxvrNPvncRmRDC8Q/dr83Af5bEYfUjmuWdihW8ZSuJlZtLusvSshdb2MYpCrLB9s9m/YiihPVgzQlH0sBl9fMQfNYyJMHlTKh0YdQ8684jv6Cp6DUeUTSNFQHJuYlYvwQ8QDp3lHN+54EPEMJHad/AeUniVQUJPVBwrfeZNci+ZOzZMF9e3B+o73PH7r+6bduukSf7eweHlZvImQOAk0JPdCqLEDLweoAIU/edsu9mX3fuRJFAVsgfDPZJPCyJXcRw26shsd/WBkYERsmharfo+TP2SPzMFB8c7agEuXNn36HYKapZoeOXVvHteeHp572aYjGoggzmOfLzTk0T5DlOW9ts5Ne7mtZxhaLsiXP33UiJmI+I/Wy5uIlRtqSysvsFGTURPy69o9y4Md4C8i1ON955u8mtgKWjstmz5JiJJxiMsZWUoRj4eNo/9fcA9wx8a+eSUhGC4z+bVFHZhZwEE99CmSAIDqI8aSqoKIxqLZha0HFKT21dyD9hev3uH/rctskHjA= X-MS-TrafficTypeDiagnostic: AM6PR03MB3527: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 86lOt46aHdcMC9L80kwaDVSZRf8GBO+xpqF1cSGhbxj/gjNC7TieF2rTWmv9fdylkWfuasj5LMTD0vu2K78u0bF39jMTP9f1fkcJ9fBsRNryyXsEEap10VD6ADABrSWLUldcrThJejqiogKnmg8M28oBHubNXzWmLXCLw+fGoa2rhRd5gk/Avw2fGYAnaF5U4jxEdQ3in+wPjCtC1BBeB7KrGNu2B9M2LZOinScnVEbvqtAvYVdPh8EhWXuZBbnP6W9n9JgAMFriVVM7R1Vi9IFx8rOdMR4tOhUKJ1AzMMjwNzlpgvvIWljU/evmNykptijTn06LO9VpbSEU68DtC3fVYIH9y88PsM1AcZhOkF0EqwWnRWaZxHU7FrRLFh8PRsJBa52hgsldIuPfdlD+XFD0MpOuhu/C2U8tuLbQnSD0aH2K+Jc/5UyL8/wv0pu/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hzCGV9eFjUaeTC0+EdFmTq9E8AQXnn34i4Jl/Egr96prTxYI58PTqAEZGVXgfXFqax75zfsMcQApy/4gjlky6FSU02euKnkbK6CwnWXIzpmWRdmX6R30O6SnAWm7a9sjTjkJxnRn96k3WZKiXtb2Ww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 158903e9-32cc-4be3-363a-08d9757a50e4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:17:25.5937 (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: AM6PR03MB3527 Subject: [FFmpeg-devel] [PATCH 01/39] avfilter/vf_maskedminmax: Simplify init 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: 3YT/CbU4L9hK Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_maskedminmax.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_maskedminmax.c b/libavfilter/vf_maskedminmax.c index afac145e2a..f0c499a0d5 100644 --- a/libavfilter/vf_maskedminmax.c +++ b/libavfilter/vf_maskedminmax.c @@ -54,11 +54,11 @@ static const AVOption maskedminmax_options[] = { { NULL } }; -static av_cold int init(AVFilterContext *ctx) +static av_cold int maskedmin_init(AVFilterContext *ctx) { MaskedMinMaxContext *s = ctx->priv; - s->maskedmin = !strcmp(ctx->filter->name, "maskedmin"); + s->maskedmin = 1; return 0; } @@ -331,7 +331,7 @@ const AVFilter ff_vf_maskedmin = { .description = NULL_IF_CONFIG_SMALL("Apply filtering with minimum difference of two streams."), .priv_class = &maskedmin_class, .priv_size = sizeof(MaskedMinMaxContext), - .init = init, + .init = maskedmin_init, .uninit = uninit, .activate = activate, .query_formats = query_formats, @@ -349,7 +349,6 @@ const AVFilter ff_vf_maskedmax = { .description = NULL_IF_CONFIG_SMALL("Apply filtering with maximum difference of two streams."), .priv_class = &maskedmax_class, .priv_size = sizeof(MaskedMinMaxContext), - .init = init, .uninit = uninit, .activate = activate, .query_formats = query_formats,