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, From patchwork Sat Sep 11 23:40:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756557iov; Sat, 11 Sep 2021 16:41:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+ePccP2/sIKD6jWydqhJ64etXjUeLkmJV4PiX+fvV3wZQ61a0SuSULfXyzD7J0/ofYT6m X-Received: by 2002:aa7:df09:: with SMTP id c9mr5439406edy.243.1631403689868; Sat, 11 Sep 2021 16:41:29 -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 kl18si3139375ejc.160.2021.09.11.16.41.28; Sat, 11 Sep 2021 16:41:29 -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=CaToinxP; 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 691A468A877; Sun, 12 Sep 2021 02:41:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2083.outbound.protection.outlook.com [40.92.91.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2F30689D60 for ; Sun, 12 Sep 2021 02:41:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e32eYGXpemagrg/fSS6bVwK7k0u2vqbMAusau/ovYRQGp8lU6XvPlmDu2AM91SIoDa9DGGA8xyByi4T9r23/Eq59x1q5bqFiQSEoARxt6ftxet1kCntQ54mmctfMtVKxE7gU/pXach86D+i0gMLLQtCZOIwfApfJA205UyofHbZUNP3s/jN969+VkOd2RxeLk+6PBD4mwEZnPxxNsAcBMvLdzVT4GWypZ+UdZIikeUzu4xP6NDOYtqHTI1AklaMumRHOSPTyZloHMtrn599YiDMNxTl1h723uPWNU0+95zkjSsHLGrHhKxcqpu5AmuMJMJyBGIT1JyV1slX/VoHK8Q== 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=QrekjrO2iLqVpat6z3R3XhkU0kj2YvkGMu8GWIO7pAc=; b=C9yhWC79f0Qwtdby91YzXu6fwQT9BQ3YDXTFhWqaUdyZOx+JLFG1h1krCpMNr0gV3X519TV+/7Ou/u35tqeI8ZAIWpFg7iekgyNwwkoejTou57HXVpdTSdO18IEaXgKuurVENKRpnzhiAxi/73qfDA1HbWRQXEduLUGsuu19yQEfpjKpoW1yxCMNQFw+HuTVJoo0D+SkCodRa9zJb6xeLNUTeHZzVWeKQrt1JOgtyvYYFcofwjVOkDoJ0KGySS2hZs8DSvWi6JcRAhBMHtzlahWZX5unaREYxnYJZeGn9Dsq0dZhvDsfxOCA5+O96v4H5KX04Z1AtHUcvQWfyBWCdQ== 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=QrekjrO2iLqVpat6z3R3XhkU0kj2YvkGMu8GWIO7pAc=; b=CaToinxPRpt9JKUcgVH6aV8nqqjHJ42XXvI/L9jxSCdEk+H73nJlH2tcHMcIcQczVcepg3T6EgHpcePM3mRtOKLsYP1a7p4YRbE5DwgRruDcFrWCsEQzl+kqU6U+KJbKjVdWJjSUizE/XUof93ndLhGHiGrOHPVLVFYfMqzu5XSsFCxqPMIOjMP7jVISVzGYZx1uYhdpJFtI87fSncNhzfhZRQd5f9ZG2WjiGLW8ZYUxDFJur2zOGu3q9n7UNGhRQsDca1Ao53cslSPFcu4TLY3B4HItp3hjgCHpHQgn+THtt0IO3ZsZ5/ClhGdDNuC7xsjrBGMo5IzEfbLf34yYnA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:17 +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:41:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [p3ZEmZ1/P8k2qi8zqPROD1pCE6RNXy84] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38cb2f35-3f60-49ab-c60e-08d9757da62f X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UFAju/N0FeFgknNl9FmpqXXPawYNNCCxK0nu0rCfN4jcFUL9P/44hznGb5c1Pvr4HIxcF3DwuupUjReV27ZnfUXHng8URKxkY9piHLBST9/h2eAbhFeFk0fGSrp1TiEqbbv9RAttlFK5Kwj3OlqjT4h3nehadh2IYd2Yjv+BGgnNoEZJ7CK7qAErpkB9YWGYIs9F3b8fsK+sjE5tPSujoiseY38ydOhbGzfeJqyedXQ6jsaDK++QAe57iV1M/AkRNp8E5HKnvlG30tAMdGD8zW5E3gKVltPJsVEJiGqMqB93KJsNJCc8fqShypqSfuLGo8urXEOKYq61+UGngNUTd9Xib/86LJa6z5yI4D0DY54jk2uyc/8r63+ztyscHliypcD9ACXB3VXXzAQduf0vlwwSG+5V/ssDYKG3V1UDA0SFCmMGXgXlid8xrNvGRDLyJ2ucOiqQtgV9VXSlrKN8odKrddfYWgb4c2n5lCrZvdKXm89HbHwurEHGNQz1AHTn1ERfpNk1MFdZGplecfEinPnd6z8oEz+HFx1Gh2fIkzL0foIhVM1xQFaRC+pYlGLjQQ3uB//JF39zopR8OsSMiG9M3tYO2h7KKqhU+CpvpcXjQyG9fA9XZlStIo/kJAYVfK+zTSnzL/SfFlCqRtHHsRlxd0UI2TuI+LLYIwPfEfgb8GGJ0IEm4bfjQVIICK8AHPejHFvdwACefVzBv4KyTc41O9uIyrW+c= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mKLUwwnVug5LjKnOl4STy1VSWNhpdVSH3SPxBDlHFuSCFLO3jO0jBJqx26VEpZZMS+6Q+2aDUW5Bu0d2TBjsK0xCwK+Xmb1xmrcTwco/gVCbsM5A6SDNFnCq/YBN4CzZngxlXR6iWF2dVB8dsHDZbC81vPmOeNvNJvEiUaFHn0JMDUGQ0ACo42ZZpKYEzXfAYaUa9k8dwWd6Y+aW0kCEelLBAYb3rP8595xB3XTmhUvSldOkxtKp74iuwS1YzdpxoKrvVV+PlQ7qJ5mdlmildqpGd/KDn7ekjhiPjHJv5uCuW4C4jW5nlpU8sHL6XMq3np34ammqkl2RGBNIv38DNlK51NO3hXrTZjw8Wn6cE5O8XmrUoSqZqCeWc4O7Zcds6quu3bCuL3nFSXmjsladc8K/9eemHR4KZtQV1r140aGMoZnJBX9mvcqsXo2GyvfF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fJVuyYrYN81HhWdsAGd7T6wd26oATzD4vfMZJXj9QV/sDTK7gJ8aF7Ir3AOJ+LVYeTrQdW1MPlKJ5dCEwGDCPNRXr6A1x4bDsT6HxL1emeWBSt0cVnMyiX8HxhzDK0svXEuz1JBfKrgl3k8tVmEwXA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38cb2f35-3f60-49ab-c60e-08d9757da62f 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:41:17.1695 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 02/39] avfilter/internal: Add AVFILTER_DEFINE_CLASS_EXT 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: cyalCwx9SYlV This macro will allow to share options between AVClasses without having to redefine the option name (as is currently done) and will also allow to share the AVClasses itself (which is possible now that AVClass.child_class_next is gone). Signed-off-by: Andreas Rheinhardt --- libavfilter/internal.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6ddf024d93..e7c154aff0 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -278,14 +278,16 @@ int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); */ int ff_request_frame(AVFilterLink *link); -#define AVFILTER_DEFINE_CLASS(fname) \ - static const AVClass fname##_class = { \ - .class_name = #fname, \ +#define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ + static const AVClass name##_class = { \ + .class_name = desc, \ .item_name = av_default_item_name, \ - .option = fname##_options, \ + .option = options, \ .version = LIBAVUTIL_VERSION_INT, \ .category = AV_CLASS_CATEGORY_FILTER, \ } +#define AVFILTER_DEFINE_CLASS(fname) \ + AVFILTER_DEFINE_CLASS_EXT(fname, #fname, fname##_options) /** * Find the index of a link. From patchwork Sat Sep 11 23:40:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756652iov; Sat, 11 Sep 2021 16:41:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHhtY9IFeNPcg1TNPwmm0WRG+aBMYa2bxE+SuVD4FLYWUxFUxywb8ReP877q9YkfWqXsg3 X-Received: by 2002:a50:99cc:: with SMTP id n12mr5480326edb.53.1631403698643; Sat, 11 Sep 2021 16:41:38 -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 t21si2766557edd.127.2021.09.11.16.41.38; Sat, 11 Sep 2021 16:41:38 -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=ixFILbiO; 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 9AD7468A888; Sun, 12 Sep 2021 02:41:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEAB968A76C for ; Sun, 12 Sep 2021 02:41:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMKSMHfkaPIjyOsILMIhD5HhmyT89TIUNhbjC+8Jl+mVwKHjZOYYFQi2yCkrlCq6TtU8FMax5840SNnqhJG2bpAJXtOsajjSzWsDN2NaCL/QunaOady40fJE0yVzCSjZUQ63OIdI6GKmdThaaO+6UxsMjFMcLjQRG9ZbK8kscbqhG/JcgZZV+pCPFl4AMEd84t0xnpRnvMGTD/+BzImNc1wAgKudaaHakPNXgdGqt1gtrsz/RDOGAEVDHOVF/J4O04xauTBNiqnOmKdr/fnUvLZL7fURVoXBfSzSAOeLB5rOtgta+A63A8TkUy/zk6mNJBLJzjNh79L3qi8alvyoww== 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=Zu8nhynwEfPrfXBU8S9j58otXIeZPoZxR9XXb7toptQ=; b=AZyRloXEJwuNw/vrQEyBoDTqU1goKrmyeWPBCpen1wCEzLMNcOXJ/uP8n0Ul2DvA2jZn0gmdGGyYjid6tqKADikGYnZaKE331HPktMtu9K3fdMa5VIHaaoGKQGWIfHAFrfZUV029CYTOVEFkWbtRNj+7nUvJzmZCKrdLDykdWWy9SDUpaLcT7+kTytqQ8ROy3uZFGH/XvJipWtjr6khSFgZJ2qOWw79joESxM+vIfhUe3/OnoqA3rf+OiZLbmSqX/AATdqal6mJ84YeynIQJQuCol5SfQOEaUzXD8hb7vzOTSbh0GfapQwLht76p5QNfr0yCZqWFq9nV5BBDfdzTJQ== 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=Zu8nhynwEfPrfXBU8S9j58otXIeZPoZxR9XXb7toptQ=; b=ixFILbiOO/W97Jq+rWLSdXkKu9bQxgbZECDz7Ogs4Xg2QjDbEdKxp7o2TynozVj3UWkDWvHGRHPZLNwXkbNWSBeEnt4VCZvDdGXKkXaNdi3fby+or+ZZqXRjES2u5ea6oFx0GthcOP+lDTueKnAxpBc7ifheITmNJZtxQBHqmPN/glseyuoSBD2IIwIyOqprZmcRAQL0Y2pWIR6eE/4usWMSHp9sD7NGqUfmsDbN4n9qxy3wYMKmWHzuBm2AQJuYnOJWRqUfgkC/T4nqejNThBKwaTDHgnqm+2u2YaZ6Pg6FfxAuz4NrC3qplinGH4Hc5b82hBxZLA7qzxfG7SGMNQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41: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:41:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Yt1ee9wU/qH78ayRSpxy72KSmsNXV/ur] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2aabd058-cc21-44f8-9103-08d9757dab42 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMksTRFWjkHU1tOV0rHPy0B76my9+ZoIbcvBSyI4zdGKv6lPKAWvpPWdVlyPcw61mm98wb2r9qIQYozVybrb6oJhkUysbAFr0NcaHOFQUndq7NtRb8H4JSj4U7oMJl0PBzodBEdfvM+i7th6em80TphdAqp80BxfrP2Tyv244/+qS1TyazwK2nC6TOmn1pw94KNe3QL9uZUbVIGz95F4gO4NJegWlw5wg63HBn9+/AQJPyEFOc4+RDrXXxLHpCqb05v3/0/42mEck/E4vvXarv7BlR0sBqwt4wpA56y3ZsOM1mWdYsOEBt0ai/lxZ9fqTxXg909gDo8ZP0bj+BLdqMD56IAOGSn+RWxt1o6zZYSJoySq+Ut387dxKJy0xM4YEerSoLIl3mM+kc3R0SsTGtKBunpujrsAuhTiXExuvKCdjz2hmWcW73uOAGwvdKwbVxc8v2kZKs5FZcVXllBN2M1+cz7sX5DTeFypsJhg0sOFbJJQKP7UsM2j1xbLR75Y0q9tfQ+wVnwnQu8L0soHhOQMNONAy/3nY4PLqy5ERcJSoWJv2SxWuNN5HFVRibUAXvElSlZAvyvtxW72vmjA2kC/xsZOPdeOn7PVfQ5yESk55TlZf11qtYjgxHpcgHZTRfm2jvNcTd5nSjw1/gS12+siB2s5jPzfz0q9Xl9evV/f0RN7b99HwFwQnNFUDneHHBPzOYQuJWVK8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4n5RfoGvOE0c6XAyLVi0EzdU3DlfjF6hrjvqW4obWPSdydF6nf6GdTrhYw9mF7vHIY1Cu6/QvB8DwI2AhrH6wYuYQsv66yIdwZTMW+Vru80FgaqEf+AskyVZ7tl+IJiwH3pnJu2t+4drNQf6j5e+s1z7GKiD7PSWRCYnYipiGBacS6Gu+ebvII9LLT2JxOyBDnWMB/AIcNMuO3GEqUC+GWXmPHJJ+3spD1ocxErtY2K4rdz1xfohKF3mJcr5lPZPHAwYIDosJMj99cS0ZGksPehyegRH18bvQeUjGz+B97/FF98CJtdq6fiaB1/DSc+ZQBFFK41LFXqhiigW9fhoPpwE3g9lYcfucr7I8GbbUtvsfEe/zFsqa66y2o2U6BYrX7UNvq4hYQBe3KXCEy8OH98IzGeSO7gdW/jSk5gf7xeqq86ms9nkY7vK9BDO7Pfj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P5GjmqFlN/JGCPflkKAB2Hg9iHw2H9oe2xZiI98Kfd+1bNHa7pWpyJVZ5YjzX2zsmwVpFXNbN7PXMAYPuLCOivxJ2FOVDwZayTBLmCmeIP+AP0EjdUrDTJJ1rxORfwZTliOVVGNtzgyGgqJfrkdhVw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aabd058-cc21-44f8-9103-08d9757dab42 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:41:25.6325 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 03/39] avfilter/af_agate: Deduplicate AVClasses 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: DifmEfjZ7uki Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 0dc28ac080..284880833a 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -86,6 +86,8 @@ static const AVOption options[] = { { NULL } }; +AVFILTER_DEFINE_CLASS_EXT(agate_sidechaingate, "agate/sidechaingate", options); + static int agate_config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -183,9 +185,6 @@ static void gate(AudioGateContext *s, #if CONFIG_AGATE_FILTER -#define agate_options options -AVFILTER_DEFINE_CLASS(agate); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats = NULL; @@ -252,9 +251,9 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_agate = { .name = "agate", .description = NULL_IF_CONFIG_SMALL("Audio gate."), + .priv_class = &agate_sidechaingate_class, .query_formats = query_formats, .priv_size = sizeof(AudioGateContext), - .priv_class = &agate_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), .process_command = ff_filter_process_command, @@ -265,9 +264,6 @@ const AVFilter ff_af_agate = { #if CONFIG_SIDECHAINGATE_FILTER -#define sidechaingate_options options -AVFILTER_DEFINE_CLASS(sidechaingate); - static int activate(AVFilterContext *ctx) { AudioGateContext *s = ctx->priv; @@ -424,8 +420,8 @@ static const AVFilterPad sidechaingate_outputs[] = { const AVFilter ff_af_sidechaingate = { .name = "sidechaingate", .description = NULL_IF_CONFIG_SMALL("Audio sidechain gate."), + .priv_class = &agate_sidechaingate_class, .priv_size = sizeof(AudioGateContext), - .priv_class = &sidechaingate_class, .query_formats = scquery_formats, .activate = activate, .uninit = uninit, From patchwork Sat Sep 11 23:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756730iov; Sat, 11 Sep 2021 16:41:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8xrVNFDoO5zzvm+0snY8jQ+KcwhFqX3anInl6fefGo4r1jRtQzgevFI8wZqH9N9Qhroyq X-Received: by 2002:a17:906:1497:: with SMTP id x23mr4951984ejc.243.1631403708115; Sat, 11 Sep 2021 16:41:48 -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 j22si3878296ejt.173.2021.09.11.16.41.47; Sat, 11 Sep 2021 16:41:48 -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=WOIHjuf6; 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 C648968A8A0; Sun, 12 Sep 2021 02:41:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 014C368A87F for ; Sun, 12 Sep 2021 02:41:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixBPALEGpi009cn5O65b9z7S/9Lz6nu3GA6mZPi5sO+kvT8BepiH41d/t55sNH4nvyKr+lmx/ZEMNLSk22xIB/VTVCymKg5A69mlJ3bRpL7Ld1cvYbRFrC0I5ivW7J7r/+U24xNX6g4TV2tHKAl8frK9WOheI1vfCQ+V5M9MvCZkvfWdZOd9W7CHW16871EEEWlf9PKlHs8ZK9h1sff94plCrn7a+VOpSL8u90nXrL7NkbXwOUbhjaX2s0l2lVctniO+0xOD1jeEtvkytLKWGEkoyLJ91Ijk3HKhTpWNUvbjDaF3aLwPY3ErjjbQusvLn0MiXEFOcBETWclQ30e9mQ== 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=zs/IB5WtX2nl64ucAAUU+R4bnHIVsAAZ7rrhmY5lZsc=; b=UQJl9vVy+aHX6OpuB9s6gRiRCMJa2gQVjGa/pKRRuXOAktZBxN+AeUZ5zU1SYMf8oT5xywbmhc5FrKOiMGIhdvlSdP/1GZEUEnu2MKuHNt6UZJ7YU/iVmFBFi5EsY1zZfHAaShIMFSUsu/KhuAkimRZxUk+HIVMsrZAk/KeDPMDsUNYQ1fxV2NJPd5jR+W3oXht5doW3BM1IKUFDnJc7qD9hJDYvpMwDAyfwKYvtdWJSgJ9otw1n/kBwTjqA0oqpH1BZQfnpS8KL5EZzal6D2f/DD5cD9wHiwPcVVazEpG535HhWH/9vX3NJAZXWHhZB8KtqVAj77EkBDE4j76X12A== 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=zs/IB5WtX2nl64ucAAUU+R4bnHIVsAAZ7rrhmY5lZsc=; b=WOIHjuf642NCPye91U7gf9xYrX+EzkCaLuVwVZbH+lyB6XLmEp9P/9WOuQ5dYVqeCx50OAMCns7ky0gS3fxTZrONd34RCEJPITb1HfiCPtu7neEUoXYn4PfOKrqCSEMfzzxxGuEIT36rxQ0ECE4QrYowWoAmk/rq8+XRcYlmfN1j+Q2+bIDFmDuXS9sDWvm+aV5eQFJM9ew2EZYCBXcl2jbO8xeGrq3sIB/bwen87Osk0a/nGrMgRcwzjV6+zT4xzELLpM/CYI4UgJJSKMlSrh/wGepVo8VEyBucSYPUAOaHWjx7IwBKjAg/5v2+gWBvRgXhvI5yuxIQvgdDVHK86w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:27 +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:41:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hVbShou4aCeBYSQCxw8zijyhnI2m3s7w] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cf2a55e-278c-4649-6b2d-08d9757dac47 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSolePj3FDpqXxamtMEQJdz7vUrS7llZH0NOrVRLbV5uZpNZmQgXbg9kA7UoPRMbEPWoIl+F4YvcUGeNGIpgdhQUkOxZhqqBfPHbW80BV/fJEVhhRgB9+CuU3T+S1NYmLvIkEowpvDi43u6wi1mQOGVQoVZo6+pzZSMuyU0/Rn9BWvnEHfPdcfHTLWF6X+bsS73rev55U21IbuaVZ6gxz4Kg0QaNfiqBmTJBJ+LN4MZ1oYd8htAXA/pOVZOar15QJh3u98oSOKmvWMptg6DpvrYRwXhyTbBaR1hMIMuNpbJbMDXpt3PSq/2bXyFPJFKZWJo2JcrdiKFZ4OPtSg7+L1lFhMAPaQ9FGQ1dy7xTvRbMs8Qvq+oKSY7i2E4bv+EJUJRJcaUnxd+mGVl5mWFmtewkF+cnY6DxxH3uN+CWF9eo3MuBEr0lCysYb52MirvE7ua+SJbjHxi4wHSJrGprVneAkiCYBMiaqaddUMsKDJh5ms89zb4T+/wr30rUoKiBGoNeC9uGrcYIJvT+EpS+pbrPrDDkfsUgDwj3NmfwBPSkgP5wEtY0OTYCx1p2ErMgsYylTPJzHsd/OwpNzNYz8kx9k9gg5Nd0t4ci/Rid6I0+ydeVrK+7rv6/BNJ3LzY0ctxZmTsNBv6MtuxSGN3zBqwFgfVwlBtoG8vaxJG+qIwjLs6xJK5xDFocR9I8BOAd79uEiobRz5bVrIVttf8o0CPfRY2STV2Z00UQJRI9CXqrG4tc= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PfLPuN2eKRrryTwbp2t4r0x/XhaOXf2PKmHphatFdhTne5XOaOLASvfo+1g3ZKFjm5U3rDIEjPmOXh8xmq7RxqtzwGIJ9esswQaI53wsAQ/YTT0Owqwk5GIVJjWrBN813qfcgi66QpNqIg5YTruwH54FlgYih4smscLi0VSvCE/dNV36KF9nrmKQs4V9RhSk3SV4Yr5oJZho7CQazGa07KR4poj8gkWU5o2F+UR84cluLbJtEwWbKqZPGUV0Htfry+xjcZ8pFxk+N7wpyvnycPKnqOpNMv2mw5k5N0eIeOxqw1ZYtEt1dXMmW1ga+50HG4eMolIUa0NjEBVa3A5IApHDPRBFvXnVL6KWt3Wdlu2jM/Wscb1T2A5/ZrEzmXaN6SBYt8zoX74OHmktEAVB/s83+iTi1/ZbMuF6Up4q7mmVSzzYxZZBJiNY/xhEh5sx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nmBG/05Oh+7VG/HTELTbtLBaEqIjxm+CjLp9/j42cp+5yYgRgHBnCk7qVbIV47d1HQarXP4X15osqCr/GhErN9eRHwH9r+mql4lGbdMYYKmUiJySp7YpaNN/9o+kXOrQNfB+CPAx1eVEVb2LIigj5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cf2a55e-278c-4649-6b2d-08d9757dac47 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:41:27.3370 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 04/39] avfilter/vf_convolution: Fix standalone build of kirsch, scharr filters 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: ZTkih1OfQO4C Signed-off-by: Andreas Rheinhardt --- Given that these options are static, the compiler can optimize them away if none of the filters using them are enabled. libavfilter/vf_convolution.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 5f59307c16..ccb3515bef 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -974,8 +974,6 @@ const AVFilter ff_vf_convolution = { #endif /* CONFIG_CONVOLUTION_FILTER */ -#if CONFIG_PREWITT_FILTER || CONFIG_ROBERTS_FILTER || CONFIG_SOBEL_FILTER - static const AVOption prewitt_roberts_sobel_options[] = { { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, @@ -1082,5 +1080,3 @@ const AVFilter ff_vf_scharr = { }; #endif /* CONFIG_SCHARR_FILTER */ - -#endif /* CONFIG_PREWITT_FILTER || CONFIG_ROBERTS_FILTER || CONFIG_SOBEL_FILTER || CONFIG_SCHARR_FILTER */ From patchwork Sat Sep 11 23:40:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756891iov; Sat, 11 Sep 2021 16:42:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZV+kHmoPBp9iAoduXEfb1BzdQnnvgepr9/KMng6kNZ2QlXwoBDvDDn7dpPHd1Fs5S/N22 X-Received: by 2002:aa7:cd92:: with SMTP id x18mr5305148edv.325.1631403727745; Sat, 11 Sep 2021 16:42:07 -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 ml13si2903583ejb.579.2021.09.11.16.42.07; Sat, 11 Sep 2021 16:42:07 -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="Efu2Fc/0"; 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 3EED568A8B1; Sun, 12 Sep 2021 02:41:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D16C68A8A5 for ; Sun, 12 Sep 2021 02:41:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MVplJQHPZrT6KH6OVNMdrYfMnHL4YvXTEaA4IP+UVc20tDTUrePR/ajLZfIgsx4KU7eNBHzewIjqYx1hM/QB7TSALZHlMhriVlrh2w7D425+WqoCsy0SPYoJnTZrelxSqkom6j2J1l5nGSicnanvMlGKXNZ9f1KwExMFOiJ8ZZpMPiOY1f+6rhBErbjZw6VtfY302Cl0OJapgN0B+RKNLangJNC2NO6YO6Ht7xySgwn8dXdFKuJspuErAtA45y0Uf7pfkbUTQ4m2bKaNf577pH+qdb3hz8OHOJ0RglwD96E3BfTPnrHFZAs4/3aPzYsyH7U/9fTdAbqQh2rGy6cfxQ== 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=0nd6Mf605u0e4TLO+jbUYuIBpKJHXd1DwsttucCBWAo=; b=eJF6btaiUHUaewyJ1btciryxxzxBDtRu4wH6Rgo2PkIjhEhsE5DMMVef51dTrGTFEwQ5HC0fX7NBG/YGSpXjMUY1hW7bUPH20ecQrUzbZ7MRZYcBj/xfxI5MtkdYCYB3i3y5zAjoDTviUr2HDaUpgHiC1xiDsaC/AVUu6bwvT+ruEmFY0AAJ1WcXWMcviC3i/wFro8xUgX9qP7Xwtz7UBc8hFBWuhv9iEqOwZ7jxbRixLwexE3/qvDH/i2yLJkbPKyJ59LTcXMg3zh3hRJo9jZiN+sw/l70//dxKARHjyN8qnDvaNhLdm86BsIvbJw6HE0sCilwulG5ZC4R/x1f5fA== 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=0nd6Mf605u0e4TLO+jbUYuIBpKJHXd1DwsttucCBWAo=; b=Efu2Fc/0cxve6gawA8YIbez7QnFWKWiM6y5BEc4Xa+pEd6xRS0R+5qEVbQYsNCD0KhmBn3FmQx3eKDidSHpF8ziRn74mrZ123WPzQBmNf+lrbsk+uV98Z4A1H6nbIF7bqeuN1G/49StJw3+gmIJp3ESLXuAW5Q5ZdQHTze0UPxgePrGc4phANyOrw2F0hpP5i3X+PIxxVHbw4Xpd84Cs1ej+Rqr/Nvht4IYwfAdcXO8YXPhghY/DS2weW66nzfzmneNUflLcwR9wVLjFtYLmkj2W1Te6SIpPKoOAS0VwNr3okwAULaTUr/L/Fdzof1322iZn30+cpmNR7LLofTanaA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:31 +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:41:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xiLZYEI5Ov8mXqG0ejzUbBz9MZyZ0QDz] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3400e4e-6be7-4725-447f-08d9757dae70 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleG9SoayymTbAJUK4SoWPuIudJP5N4fgWnHou4LjbDiJh+ru29wMSL9iRNKCT80+bYppn77dAyssx/I5RU65eeswb5oJraTut3B+UVOSk+Q7Sl6r4IsRTceQ2mFtlLfjegHh4KnE031c4WraqudGyjoeeqkZB7fx3wND7BgfKSlXr6mUui0bJe3JbKUhYU7IEdPGFBtJbZBnWy1zPFPTeNgUJ+wi8p81w4jAv8L3WnZ9bXvdEHoOTS8Aoa6m1d3sMcibG6JLtQWlS90ESayd7h9LeQNMUuOm6Xr5AR4gyHccC6QkJ8iSJ1CZYnHXRjgcKKhtcinoRABRXJq6K0OQ11LMXuKoYFTQIl0oAizJUNhv7cdfa6LoJDWyOqqKLuUQ6TQMXPQqM3Bc8vp6vL6BwiPLxW44zMs4J5eD0adSFd8rMYJItYkDKiM59tfgdwYlj8TbJrUOyVw03izCMJ9sKS4SZux0LW/SR0hSZfCcZVhOC7kFX3I/5lP1604WXKz+BDr0Krsn4tMEF6q0IRgcvSbXJA0Yd7jmlhGAMZael76ueX3Euefs71J12Pii/JLOfc92FvMGtRJ+SjHOc+tysCfaLi6BMQ3lE7PJ2t8aXQyLfN34zO3ABBz4rLEYQ93MIIvJujs7EKY83asCIvFkf8jBpdFwEP9thxbVVggoixtGXrneInTSRhVnXqEcb0FrkHRXF+jLE7nxfc/kIfP6a7YPpGvmGuRn7XduqUEKM7Z6I= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5uDJawUypIlM9CZSucjfMOjCRIC3yIpnEj9WIXGtmomum9H2OUfo1VgiF5yCI6YHCNSGDnzz4M1uHmta7zy3rKkMzvmxuUDCLh6QhcJWdhShcUvo/lgVSxPg7lwSZekp5xUJqLA5fnaQjNPR+6f6Nic69sXCIaZtTN9asAaQDjRDcMFuItii6bXIgl4i5DWVJ4YFBrxkdjWvo5fS2GnWTP5YCdtajIeA8tyRQVgU8uZjk+hrJIZdqQeDdaI+lI6QCxBEBdSdTSDx5DHZQHPUKgOYAgdPNIQ+s4RYMaWb5jRr64GIyFajdrsnERGe3pyUPZcDBJSnSljN7TvSBhq9Ci20pXQoYl+qFYR4FXHcMTJ74o63u/83mfXOqCAwX5Y3FVpaCVN+t5sFKeN8kYD2O/9Jl+PHPu1iMvk3sN59Sr29gpiexzWIAJNVZD16LsCT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mf0Bks24ysAWnowjz5cK1yOwfIHbUEVlM7D0Eo+0z61psd9dPIGO7KsNJfTO8e3P4tj3C4r0iLMTFodJrEdE/u/Dgj/Blkvz49RlWGUJfJzQTXaWs1/ISu7duHkaZxE5LWQbK+OxOxa0rBDBQSL85g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3400e4e-6be7-4725-447f-08d9757dae70 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:41:30.9562 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 05/39] avfilter/vf_convolution: Deduplicate AVClasses 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: oLjC/xQzkMq7 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolution.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index ccb3515bef..c1ebf4c791 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -974,23 +974,23 @@ const AVFilter ff_vf_convolution = { #endif /* CONFIG_CONVOLUTION_FILTER */ -static const AVOption prewitt_roberts_sobel_options[] = { +static const AVOption common_options[] = { { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, { "delta", "set delta", OFFSET(delta), AV_OPT_TYPE_FLOAT, {.dbl=0}, -65535, 65535, FLAGS}, { NULL } }; -#if CONFIG_PREWITT_FILTER +AVFILTER_DEFINE_CLASS_EXT(common, "kirsch/prewitt/roberts/scharr/sobel", + common_options); -#define prewitt_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(prewitt); +#if CONFIG_PREWITT_FILTER const AVFilter ff_vf_prewitt = { .name = "prewitt", .description = NULL_IF_CONFIG_SMALL("Apply prewitt operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &prewitt_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1003,14 +1003,11 @@ const AVFilter ff_vf_prewitt = { #if CONFIG_SOBEL_FILTER -#define sobel_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(sobel); - const AVFilter ff_vf_sobel = { .name = "sobel", .description = NULL_IF_CONFIG_SMALL("Apply sobel operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &sobel_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1023,14 +1020,11 @@ const AVFilter ff_vf_sobel = { #if CONFIG_ROBERTS_FILTER -#define roberts_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(roberts); - const AVFilter ff_vf_roberts = { .name = "roberts", .description = NULL_IF_CONFIG_SMALL("Apply roberts cross operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &roberts_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1043,14 +1037,11 @@ const AVFilter ff_vf_roberts = { #if CONFIG_KIRSCH_FILTER -#define kirsch_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(kirsch); - const AVFilter ff_vf_kirsch = { .name = "kirsch", .description = NULL_IF_CONFIG_SMALL("Apply kirsch operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &kirsch_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), @@ -1063,14 +1054,11 @@ const AVFilter ff_vf_kirsch = { #if CONFIG_SCHARR_FILTER -#define scharr_options prewitt_roberts_sobel_options -AVFILTER_DEFINE_CLASS(scharr); - const AVFilter ff_vf_scharr = { .name = "scharr", .description = NULL_IF_CONFIG_SMALL("Apply scharr operator."), .priv_size = sizeof(ConvolutionContext), - .priv_class = &scharr_class, + .priv_class = &common_class, .init = init, .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), From patchwork Sat Sep 11 23:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756975iov; Sat, 11 Sep 2021 16:42:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+Jt7ph/dydeVPKVWJ7FVD0yTSeQy1IepCx6aenVSRoUErKph9QZNgoYxAhfhr8Lulr3jm X-Received: by 2002:a17:906:5855:: with SMTP id h21mr4905839ejs.230.1631403737244; Sat, 11 Sep 2021 16:42:17 -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 hx27si2920445ejc.699.2021.09.11.16.42.17; Sat, 11 Sep 2021 16:42:17 -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=CLHElVBf; 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 6406668A90B; Sun, 12 Sep 2021 02:41:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17C3B68A881 for ; Sun, 12 Sep 2021 02:41:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dIEr0x+v00R3Mr8LWQXxEsMkAYvpqkE0gmMU61SlNWn4q2I7r/ZZquoh5BxhaSCmUpkIFTfRD45FLPYcDbenTzC99VRR4kGEPLYYI387Sru0cQGckj5yQ4P1gJW1DcEBXdVT3AIicxsmgF0MoDBPWTpKrVCiJyF78gtIkI5dAoRYwWVcCYrTBG98wpHpajKawAPf7KeBspta25VYMSohgKvAgmEHVFyOfE4+I9t2OeCy04/GVdj1TOHFIOUcH8e+YCpozThuUdjfeTI8c3YfIPrAED+YP1WsMVu/OXeUp1WlBvN2pJO8W7L5z4girnb+18VV5ddMMx0CRyLCZ15MKQ== 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=xRIWlM8mpe+FV8SAtsfN5Le6fMdK+71A1I8TiKrOWdg=; b=QVZFo70gqyCCKgAPTvdXy8hhqcx5sbg3HYwMK9BTsYZ8fYyK3I3ZARm6QEebgeP2wFKLzouJO5bdv1Xyp7BrNXvel4iTkgxznZOhz5i8D5V6Q4jTItTeq4pwC2Xq8otw/+3K8GxuQ4qHLxcVp208rwopvVxyhWTamwSkIKpAlvqaadUQ00GwHtmcNnbwBqH9j7A48P8QaeR6eIMi6oV4ROELSN7pCP570spEgthFCNPbWzF3szyRaNTw0d/14Aaj/tnBHaJZwb6p4VmBlj8gZCTH/dfW7zReBlYDjGTnoxewFLtJxMwLhEbUgv0yGuDjLZh85MnkkjoW+JArIWYQRg== 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=xRIWlM8mpe+FV8SAtsfN5Le6fMdK+71A1I8TiKrOWdg=; b=CLHElVBftk0ahKVg9rEYVPhSi0f05Hvxa6D64yQgyOizOxHMf27L1O6qkwXivZr1x1jyC6wCpj2DhOxyO5S4ZP9qeGLnGpv8DOPs/iJe+nbIy/7KXul4aHmJHUVhxopt7ByxE5JMpMhtvW6dpmlOAoydH6zXACzOHNCIJrA+/UXSgN3D95zZHMY2avhI2AMOunMAiT6boyLFJwsCpLHpAxwAFHh7bbcoPZfVI4ifNh3zRqsbV+Io30eeOa1JyOu4LVMn6u4DSIqAHMmkzSSM1nxCDgYU9VoTlyvkycxg10PtSUCJ4VZv3IVoX1ubvu0jPRMw4fa2SpZRpvZ0kki2JA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:31 +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:41:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [aG6tFnYUEKAy6JrFFCnrZoTMc0LOgmqj] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a44dde2d-4601-4e24-bb9d-08d9757daeac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIeT69taegqggL2KeWuRHf6tp7VWx2tnI6McLkTt8x1fudSF8f/FzmHnuB6zkuMYPCPS8bEjpwKFFw5VSd1W+61SpLjOwXcE1q9Ey/3oGhGep2Ov04hzbXj2mXpUjh6MloMh1wvdY0+Wrdi8x/IeSUtMtvqvSm3Xvh7R8xRrLqQ/W3I9pxkquvroVmhwJlP0ffVDKedpHHljw7vwU85POMpcZgnCrMqdLTqcN+zanKpj2227wyJuSWHFwEZMoJFzcSzKg83e98TV8o/84Sh4vXKOeRRAmltNYLse5n3NzL39tS6N4t1l7jJpVCHiGmOTgDhD/5BUG0xI5mSpFXzMn3A1vDlH3FvrFnMr5XIdRLCTzC3vZmv/W5jA9QPg/hKPtp5jeA40SuIMG7se3yFg4SOaULvdSTTzONhjps5+gD6SYDQWywOtRJ1rdlOnOiB5iNIgwv1FxQo/VE3m8SPFL1cH6VBtSPztb24F/bcvJZ9cPf7UygbjpWf99y5NeSqjlB1o1xQm4Qu2uTgoLezqhaytPOftAX1rAwCHqvL91oRUJOmw+b5DU+/2YrgRjGRaHPzLf9UVgwmE4qomX9adYtfrktLqqJFVxLUFw8FldliLkD7uM0D/BjATgIkE9fxuaalhXhpWRCr2mt44MR6ChUUp/z4QNEA4fS2vXlZJ2ZhZ996XWDw4gBHw= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /4FWQgdD8+vd38XQgQCHjTgDFBA8otDfz4ctfCDvWGULV/Sw56QlWNvdjNudq0cAz/tjBozcVv62X4nD8f7wUyYc1tnp/rHRU7/Pb8y+ZPTZr58vjCPRPumHPYgxDxkzxGxrsW8ScSojQPk2/yA+EjLqV+GpB3EJFsyz7bvDnC6BH0PaY2wXvoDFSIr5v5fSAiFZkukej84WASttzGuYno3s3m5R8T3GP6YFw2SRpmWjMIDsNwGUOqMnqGIKtY1SbJfKJw9TxibdEXAEIUpT/mpmoBq/6pFbaPRD3eYfcjDCi7Tdf4JbdXR20PIQkFmgcz5jXl0RQgrE3fYNX9o7jHH6S6RQ8uslnb9pPnLI2VdRVTBuwuONI9XEMpznFuZvnHPCz2Nra8qEBmZpuSjsNmz9c9VpVCrIQUGX9U/NzfUYoDmsx1/GemMQcVU9Hp+o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o5JIePjNaJInHyf9M9PTRiaq43cdh4yExyI3lg2WZ5M0ByY3vn+t9mcmxOxBm4wMub6aiWfmt882G9cy8AQGRj/Pza9uN0dX49q/cxWzzv8xNi+edzmDXzovqXVYxpnBUzYCwkOGinDWp5Dlfi7abg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a44dde2d-4601-4e24-bb9d-08d9757daeac 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:41:31.3564 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 06/39] avfilter/af_asupercut: Deduplicate AVClasses 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: OuGV/AdAnAWm Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asupercut.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index bd8b1cf44a..29f24c7055 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -399,15 +399,15 @@ static const AVOption asuperpass_asuperstop_options[] = { { NULL } }; -#define asuperpass_options asuperpass_asuperstop_options -AVFILTER_DEFINE_CLASS(asuperpass); +AVFILTER_DEFINE_CLASS_EXT(asuperpass_asuperstop, "asuperpass/asuperstop", + asuperpass_asuperstop_options); const AVFilter ff_af_asuperpass = { .name = "asuperpass", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-pass filter."), + .priv_class = &asuperpass_asuperstop_class, .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), - .priv_class = &asuperpass_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), @@ -416,15 +416,12 @@ const AVFilter ff_af_asuperpass = { AVFILTER_FLAG_SLICE_THREADS, }; -#define asuperstop_options asuperpass_asuperstop_options -AVFILTER_DEFINE_CLASS(asuperstop); - const AVFilter ff_af_asuperstop = { .name = "asuperstop", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-stop filter."), + .priv_class = &asuperpass_asuperstop_class, .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), - .priv_class = &asuperstop_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), From patchwork Sat Sep 11 23:40: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: 30166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757203iov; Sat, 11 Sep 2021 16:42:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybggjH/zzOBgf/sXhBqE/MmL8qgrYkVrYu53PMgjOyn0kCUN/kgRCZtm8u67ei5adNNaKr X-Received: by 2002:a05:6402:1c1e:: with SMTP id ck30mr5217734edb.103.1631403766151; Sat, 11 Sep 2021 16:42:46 -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 h15si3098376ede.550.2021.09.11.16.42.45; Sat, 11 Sep 2021 16:42:46 -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=DhJozzxf; 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 3953768A930; Sun, 12 Sep 2021 02:41:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 300D268A8A5 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTgsEBDsUkmiLcWa8zZJaoMxUQvtqiobPgNfei+UvtoABhP3hfsBuCAaKt/demIe5W8fodlHXl4oxgi+2L4PRycbeOFEDfh2eeXg55HsU3dFOtqgZzaxyxKQFe/wES3utPCZfYcptlHszQIet1KCHOnLCp0O17WbPA99ehsN0m7tWkfrvhNAVRJ70mdTdE6byeHoyWJdrWA5d/j14G/UMnG5ROalGy0iHAY6UYv1US/r4K8Wi3e4VZ6zHWYZ0RZh6GvLxl6Q9u1CGBBx4r+TTV122qHNzezX8GM92nH8475IAf+0okRXZCw+60dJhcXrhoEbXKio+CRaEj3/6lG3/g== 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=tkeypuDS4og6g3H+U37pSMMskkN2DrF4qRPH3nVUCrU=; b=XDWK1699HpvX3VdJpOQVu/AS6/T51daIsPG7oOzBtRhE2uoIaS8FbR/XzCE/VBOzALlwXKlRzaP2IhlNes+ICAfSmR9BZD6sLoRY42RTJ2i62sRrY5sKwx8yY4qYIe2wB2A1fvQgF9VMM4lvyreS3TtIE/SpQW/pxvo+S31Vhv7EeSfWn1TY5BvD/dyKc1gheMbI0oe3i9wtGF2zxdETe77vvPNNOYgXN2P6PSG/ZWymRlfyEIneB+tnxauyxzvWYRpR1Sfik4qxU2bOkVBeH91zDRU2reYm9zGr1nY7EKBL2mPcMtzetE6GPWb0RcWzc1p7w19UEWs9qp/Nrwy11A== 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=tkeypuDS4og6g3H+U37pSMMskkN2DrF4qRPH3nVUCrU=; b=DhJozzxfFu/eYuTE5ZbxMGTOJzZL8zWAxW6actZLNWmhRWVnupxB1urpW8km7lf909tSU6qoTzdwQYJF5oCptCPe9ubMSgDGP9c2FxbUXDr/gFkysv/1K8N8uutuzlKOh4KZpMObtVqonBIl5r6UDsuEVSvwjJHpVg8mUBbwLrAZ1cBUQV3Wyx9nSPwD0SOfK/z9layeUZNk49smrFRiDBIKymlFJxDHtRvM3RG98tcIaihuShlzIvrdGoJ6Pg1Jw3BoT9pd9nizRyLI7EEJnJKWF3H5ZbKd1yFx9tMn3SGDzDR5/h/nsJQQKWlwX/2goDc0N06Gl/ohcszEtQrSnA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:32 +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:41:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pXC3+t4n8uGbMr24VSuok86oivM/BfyV] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad75f376-ec39-45a8-2dec-08d9757daf0f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYM/8C4AD1FRg9BimNal7QQPlDY13PODPiFMX4Q5DIBdNK7jqJD0tZTNZ7kzYWMahh/BXX/OOZh0JmTq83mk3eUKPmnxqw1J6juvJAmllyKyL26o/4A6gKPfKnGp9RHB+4505DhiEaYivhmEBTFBZQyIlIjzAdQFee82xxSwRcXlJUbEmQC5SBBZuUIyX1rO1ISkpkqm9PU35GnULpe/Vf2TonwH9yhV13oGZ2CtSxhlfEUQsj7jP10DKpeETz2WdGxGrRzsQ3HmaT6kaxi/rArZdRiDD5O4pMSFQHxFFaZan7gVQZN2was7DVXeYyv9o8IgK1C0sot7Sz3mi6W3Lt5NMo8g+zQSngxeOscN6tlnGUpFTRCotH9n6+rmxVLKzNKKzjWILAjQaMdOSDSxQu2PUfdM/n5MDQrOv6uDuoDFiex+kCWuUyn4hwArFypJueco9yv0p7GQ/S4q/rwlitoHOzLIlgEsddYvOjCjzy9FFGy2420VIL+KsEoc+p8KpEw1x9/+W17nJxYrhD/DoTXFP1g39dYrNqEOcly09sMdQ7Y6mRU08LdLiw98czyzMuicsn0j5PFcW+4fxkCP/05BSDkGvY1aFaJVBhlL2GJ+aO87QnGenNM8afGL+imSV7wokjC+WgdpTlaU7+2F0L0XByGBq172PyVbHM4Fa1n9kbXMIZS7U4CcwAYjO4he7mHX5mnLQGOcnQ= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IwXXWq6UJSxN7zR+wVQwQzYdP/Z7PWrfoh+k1HbBLXWymUYq/ENzkG6lNTFIq4DsJ+OByB//pO3rH14f2Ug9Nw1C+WSmhixyB7bLj6XYtiH18kaD3Ht0N4mXJ6EMLM49JWnMJ77cI1eo9LVLp99sUpAzZuzwtg7yhh55OJIrAGo6oxV2ieNjT4DXhqCZuDeiRNBTgfUtX2BK4aKo5M6CPW1qRVX/SsRcAdpkOZrTv4aNE+ji/iNppItjcIKYZefch1eYL771kjoxqsP/YpNCVbH/0r0k6HL+/X0uFFd16JZ+o2SR5GDqCkfXHWuAs3o1uxkts8XyS6dP4TV2UjCcWblsFiYMg0tASYdFqLQ/j+Sro8yr7WwUC2xTDii5mFhfOuu4PYq1YvPnyGaHJ0zimKgVKo/XecG24Lv81qJaS+muiYIJsjIm2NazunVhZuH4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jGh7Okbq9Ko886rdgUHqZ8+itL1nJliGS9MP9c1pWXTZ3xdbm/Z/l9uiWHsbh1efUrNIvkj68nw+5hpx8eDJqxmCJzcFf1ZHPXOpckoUGZ9ksfM34fThXqygJzihN+J3FQNGtwvPyeYvbil6geSJ1g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad75f376-ec39-45a8-2dec-08d9757daf0f 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:41:32.0076 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 07/39] avfilter/af_biquads: Deduplicate AVClasses 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: x4FD74sEA/PO Signed-off-by: Andreas Rheinhardt --- libavfilter/af_biquads.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index c110734458..828af05b20 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -853,8 +853,7 @@ static const AVFilterPad outputs[] = { #define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM #define AF AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM -#define DEFINE_BIQUAD_FILTER(name_, description_) \ -AVFILTER_DEFINE_CLASS(name_); \ +#define DEFINE_BIQUAD_FILTER_2(name_, description_, priv_class_) \ static av_cold int name_##_init(AVFilterContext *ctx) \ { \ BiquadsContext *s = ctx->priv; \ @@ -865,17 +864,21 @@ static av_cold int name_##_init(AVFilterContext *ctx) \ const AVFilter ff_af_##name_ = { \ .name = #name_, \ .description = NULL_IF_CONFIG_SMALL(description_), \ + .priv_class = &priv_class_##_class, \ .priv_size = sizeof(BiquadsContext), \ .init = name_##_init, \ .uninit = uninit, \ .query_formats = query_formats, \ FILTER_INPUTS(inputs), \ FILTER_OUTPUTS(outputs), \ - .priv_class = &name_##_class, \ .process_command = process_command, \ .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, \ } +#define DEFINE_BIQUAD_FILTER(name, description) \ + AVFILTER_DEFINE_CLASS(name); \ + DEFINE_BIQUAD_FILTER_2(name, description, name) + #if CONFIG_EQUALIZER_FILTER static const AVOption equalizer_options[] = { {"frequency", "set central frequency", OFFSET(frequency), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, 999999, FLAGS}, @@ -954,14 +957,13 @@ static const AVOption bass_lowshelf_options[] = { {NULL} }; +AVFILTER_DEFINE_CLASS_EXT(bass_lowshelf, "bass/lowshelf", bass_lowshelf_options); #if CONFIG_BASS_FILTER -#define bass_options bass_lowshelf_options -DEFINE_BIQUAD_FILTER(bass, "Boost or cut lower frequencies."); +DEFINE_BIQUAD_FILTER_2(bass, "Boost or cut lower frequencies.", bass_lowshelf); #endif /* CONFIG_BASS_FILTER */ #if CONFIG_LOWSHELF_FILTER -#define lowshelf_options bass_lowshelf_options -DEFINE_BIQUAD_FILTER(lowshelf, "Apply a low shelf filter."); +DEFINE_BIQUAD_FILTER_2(lowshelf, "Apply a low shelf filter.", bass_lowshelf); #endif /* CONFIG_LOWSHELF_FILTER */ #endif /* CONFIG_BASS_FILTER || CONFIG LOWSHELF_FILTER */ #if CONFIG_TREBLE_FILTER || CONFIG_HIGHSHELF_FILTER @@ -1003,14 +1005,15 @@ static const AVOption treble_highshelf_options[] = { {NULL} }; +AVFILTER_DEFINE_CLASS_EXT(treble_highshelf, "treble/highshelf", + treble_highshelf_options); + #if CONFIG_TREBLE_FILTER -#define treble_options treble_highshelf_options -DEFINE_BIQUAD_FILTER(treble, "Boost or cut upper frequencies."); +DEFINE_BIQUAD_FILTER_2(treble, "Boost or cut upper frequencies.", treble_highshelf); #endif /* CONFIG_TREBLE_FILTER */ #if CONFIG_HIGHSHELF_FILTER -#define highshelf_options treble_highshelf_options -DEFINE_BIQUAD_FILTER(highshelf, "Apply a high shelf filter."); +DEFINE_BIQUAD_FILTER_2(highshelf, "Apply a high shelf filter.", treble_highshelf); #endif /* CONFIG_HIGHSHELF_FILTER */ #endif /* CONFIG_TREBLE_FILTER || CONFIG_HIGHSHELF_FILTER */ #if CONFIG_BANDPASS_FILTER From patchwork Sat Sep 11 23:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30158 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757124iov; Sat, 11 Sep 2021 16:42:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQcGj7mGnsGCxVm6pGOKT+xcmgqAUwOPNx5w/u2zqxnB9YFW7WlnPaV5bNG9WZUj6mtVbq X-Received: by 2002:a17:906:2ec5:: with SMTP id s5mr4752948eji.192.1631403756316; Sat, 11 Sep 2021 16:42:36 -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 l1si2928316edt.613.2021.09.11.16.42.36; Sat, 11 Sep 2021 16:42:36 -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=sAu0CkBV; 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 4AF2068A8E2; Sun, 12 Sep 2021 02:41:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A69568A8C1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NzS4wHoUZfelpCx0jdFf8yIDPApokNkrR+PXrlwZ9k3PPX/NE2zqsoXuYVn8O4q2ReBrOjhpbhujSRE19x62weFfB5lF/795/kH12oUUxcalJTNyi/EYKEtehfp+xf49HuwjC/plYQAv5W6NU5NLKazBLtqroHUxO7nCB1SdoxqBYSiLdTsm4/1pJmysozJCa0Df6BreqRQH0qKeGKjEcapWrsei+9eDKu/qqtmawVHG6tqnLP413iTrv0HuWpyX1/qwYjT4hucA0OxvmvBcXaDDEcVlZwOhlOks/HMK0eO4/7j4X3fvzzC15VHgqbYdzMp+ac6tk754+2XaezB+5Q== 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=4KDKLQZBbuMldZp1Npl9Qnm3G1GJH+WK7DBDNG+frkU=; b=ffk/WZwXyxgIMVlPPYPVwZUaTa36+p18Wgq/0RT9p17xj/TINds4g13DFfXnEZ4vfQQnXgmvybMpzpni8/gdYYjChMsep2tXl5HzEQtN1jkJrmazrAKLBF4AxBAcDp0RZqSpYxXg62gONOFFza3SpywLuvJunWgwpQYgkab64FJEDyaiJoBPmkkfjFj6Z/lyqvWSA1T9oa831AKYZhsRyKNZvgA5Ab9JFwc/eBzJInUu0gKs+notyqbYKMOuceRz+tGefhl+NLZ8O/2V0W36UqKl+MB+luq/l02yYbqK3Gw0NC7LnD1h/cyCKgLykhSJO84vqRnSsysdUOTrX6+g2w== 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=4KDKLQZBbuMldZp1Npl9Qnm3G1GJH+WK7DBDNG+frkU=; b=sAu0CkBVQLMrkIdi0ORH6RSkyAjk+Oj5crL4+/wPVGKD7jbSiXTm3xrArMn+CbogzXIhAQkZTIYhyBv06fckD/nHEC3UZTklUMrhPToKz/858yjk5FeC3Is8kgL3vdHrxzQg8P6IIW25fsDz03ilZgZYPOzfHsqt0tLgtf9wPDU02y1LEDHJGSbt+E85bCNf167WjDs6ndxJN7iAUNaHGBeL+DAS2WCPS4zYcTrsdfLV0lseMJhLjC79ZKZ1oPVGkAgK/4POkRm9oAeXy9ZduA8mfJws/qCV21yuDigunvXg/kvqVaBHiaXBCQVwO69yZx7icChT2SOS/Hc+P1gJRg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:32 +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:41:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Q85AoLGd6Mk3USuORY6rm4qt1hsI4ic7] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 494f4251-f50d-43d9-8e73-08d9757daf4c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleIXum4T9PygVeZXrBU2uDYeqpq2FP9Zl/fygwK+q2wFiL7mND3RrDEzQlTdig+c2G8/R124hx1/GoObQmtVPmPV9w/AaUve+PrspH7HaYz+le34iG2ajosDssuIA0+c5SJclXA3f7y3K6fq6Yn6vYr5Hl5wOKPWDw2ajYeDqsTlLImwi8mrNju7kdmh8+wGHrXqRFiYENqZ0+t9ofsrn1BxDvbCompzMffXnLWVkP2VeYBPuE3hfSIbDn8cPDVvOtQ3fgvM6DGgIwmCIXiFr5AkPOmRxih+azT+pnyK1PJqIbZEnqlvM/71tJfsZRUVMxOOjD9f1P40tOiqPkqNVB+NuEYm1etu67dfGtTkW+J4yh66IW47ho1y9hU1Qg8nePsHejHQrIAGMXWS+2ozcKcsyF431mh/d7YyH+t/3grlB/nDu5g0mej3ric1cEoQ1Yjdrt5BDiLmPps8PR3Zj24snnrbyUHm9b3L4zP+PwWCnVfBKLXafjGTCas0EwW3faVnf1ZYZMFsNIfsHzbhG0ugzLtysZMeD/cQ022G0gZQlBdbIQrfMMC1NnDGCjnAkFP8wYHgNh5aGCxe1VFogSUX6rB5klM+PwBblCZHSw0ciSjtuwg0/axv/Wl7PwaCMJfP9jXvTM/P2b98ndz/UKCywNmguoHjbogKGTw/joZUZcSlLg1BVNVtNozvP0wc7lJgcvPD1QeDKmHuvCftbjRIGvfnmoflBiaTQvkwhrmpc= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JMGc38Nyzai8XrYlNq8e9TDCff2HhXjxWTtpeK8i1igCM9IU689Iu4EnIXUyE7azc3XJUZ14OHjY3Tn5LXFN+OnQroHlVmd8QMkhnkEU7Nb4LT8CKxFX+TZt3bDkqalI7TIB55ueTlTsbCsvP5ASeAvjFx7oHJzZzc8xNmJ4NZXZcETmcqZiM8kbx//gppW2qU+pcDRYn3O2IiE7pkmAjJKELUshl4sIaBByltBySAxHn3Ca4N60V9c4M6odkJqmhsi3WCRVMdrGr+fcG054MXgEJvvK8vWQW1Ul/tBjXdsrVQFl0uUgyoG3uSXmjGe/NMzZSY4qEtkEYrDU+Q/cwO4NwR5GKLKosExxSeeoy/gfMpB7HydkA2lz9tfDO5l74CxU0JTzB4amJwg8s5R5qhPpM9z9TB1lEaYN8BKjigrN41N0fXFDCFO2TVD6J6vS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JU1Umo/u9ZYM9cBiZmOSZlIObielL2fWUJ/hn6txydJJbDS6Y1ggtCMjNnvnmLWl0PmyEUcVpKiqRBvqy1QOlzgGzyaf/wLgx4By2CbnXy3VyHUSgtZkGIkFdwxWVBc6PuNNBgH2rrbqrzg/h5JMig== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 494f4251-f50d-43d9-8e73-08d9757daf4c 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:41:32.4068 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 08/39] avfilter/af_sidechaincompress: Deduplicate AVClasses 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: EKdIRYbV1v/l Signed-off-by: Andreas Rheinhardt --- libavfilter/af_sidechaincompress.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index c964e0d27c..48d450fd50 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -93,8 +93,9 @@ static const AVOption options[] = { { NULL } }; -#define sidechaincompress_options options -AVFILTER_DEFINE_CLASS(sidechaincompress); +AVFILTER_DEFINE_CLASS_EXT(sidechaincompress_acompressor, + "acompressor/sidechaincompress", + options); // A fake infinity value (because real infinity may break some hosts) #define FAKE_INFINITY (65536.0 * 65536.0) @@ -384,8 +385,8 @@ static const AVFilterPad sidechaincompress_outputs[] = { const AVFilter ff_af_sidechaincompress = { .name = "sidechaincompress", .description = NULL_IF_CONFIG_SMALL("Sidechain compressor."), + .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .priv_class = &sidechaincompress_class, .query_formats = query_formats, .activate = activate, .uninit = uninit, @@ -443,9 +444,6 @@ static int acompressor_query_formats(AVFilterContext *ctx) return ff_set_common_all_samplerates(ctx); } -#define acompressor_options options -AVFILTER_DEFINE_CLASS(acompressor); - static const AVFilterPad acompressor_inputs[] = { { .name = "default", @@ -465,8 +463,8 @@ static const AVFilterPad acompressor_outputs[] = { const AVFilter ff_af_acompressor = { .name = "acompressor", .description = NULL_IF_CONFIG_SMALL("Audio compressor."), + .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .priv_class = &acompressor_class, .query_formats = acompressor_query_formats, FILTER_INPUTS(acompressor_inputs), FILTER_OUTPUTS(acompressor_outputs), From patchwork Sat Sep 11 23:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757265iov; Sat, 11 Sep 2021 16:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCD0ZztMIq31Ed5/ZqrINRpCGppV9q4haosj/a0XR4m2l3AQZQQP22w4jMF3l41VqhSFge X-Received: by 2002:aa7:c952:: with SMTP id h18mr5476282edt.18.1631403775588; Sat, 11 Sep 2021 16:42:55 -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 e1si3746519ejy.467.2021.09.11.16.42.55; Sat, 11 Sep 2021 16:42:55 -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=ix2PSdHN; 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 47BB568A8C1; Sun, 12 Sep 2021 02:41:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46A7268A8B1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kNVhjaB/lIQYvitRY670q6weReuvzqAEHua+EYpQuflw651GgemqMHch2UQYIwMwUJswBOVekcR1jL6g5L5bEtqRNCXvTaIu9a8b70+dgIi5kCBqw14WDW8f9lUMyiyfCbhePEFAXOplnLPA5gtOQxQrWtl2r31Q7WwJclkLf7SC2ffOQribzTEhMz1sNvFNkzlsaauoD36LDaciZa7Ub2uE3E61UNXsGu513pxffe2Q1XZ2CqsgjRO0XNtlMb5KTUZ+MRS1JFmwdEmwfrQehJ+1mVfc4YrxmON7QTzWrDRpehnJsH5AFlSvxFHYlg7F7ar/LgOA7caQdiBFpThkLg== 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=k8SxNxmGtwG2X9TRNTTLrTCBOyDUFv2EjVc64cntQio=; b=lN1F1sHi1ZcOfzhsoTij5Dn24QQUM4Qkhv0LV5kBKhpVT6TqTqGg78FJkAmzeqQt6aCZ6POO6FYvknGN1tPYhV67ZY9fxxZ53T+DsRP3tOdEEXdZCgjJTPGVIvkLVBESaab+6+NHdnsF/aqHG4vjFmpO4iJbQdXf+joj6WY0NO1Kzsc54D/4FGvQnA0JscNrzmQkx+DApGJJxlUcgdz5B1t4brg6Ai8Bj0lD9D1rp6asClTarsAnQkqKJd2x3tPN1oJxDkWt6MJjsEUe+pHg8ga9/3Y2Pn52XNLPMg0H/82pxBAqyROOw6gfDAdojR1wh3cRmrU+ltVH4VDKy7PXtQ== 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=k8SxNxmGtwG2X9TRNTTLrTCBOyDUFv2EjVc64cntQio=; b=ix2PSdHNvkE0JybbWX913J1DqwjAH01/4fEN+VyL6qalK69aGFkWV2mRQ4h5tUOlT3pfMD+XUTwBH+PJMKvLBNd1spEC6oNBSl0X6HiQFk+LdZLyoIPfCDwf17bNOyfeoNcSH4Ehbu5z4x6wWuIoDkUSiUDeJwVTc6nSzelL4iTsoRpo62azPWxKrPwcQcj5cSDAQZseJJJppth8+TNWgw1RbQowCzOoDQWtV5haQuTgWijbAA6Rh3k9so/66RJLt3icEWPbwXfYD1mWjiOj8rf6kiTp0vyBYs2XIpGC1UjgsRbXhjIWfb/Syi2yqeVL9ipShur98jNTu6V3d3jl9A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:32 +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:41:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hntgyySJdRM9J1SFkONCUbxJORQA6zlF] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf8b2955-088c-4aad-8a8a-08d9757daf8a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMksTRFWjkHU2ce/cyBvv6mD7LWuzi25m7IdsL1M8u5GeXn+FE6zLr+F1Ebr3bnhG1ftAr74wMVsL/cql8gFJf5IILTLdi7Y5veBC9lySxru5KvRJY0gw+rAnm4D2UYDMw8uOykIpJTOcdtPZ6w/iEH0zMbFoBYg2b1I5kVHE9w3xi0dbrRSH5BUpFatfqgB16Rvv+p/3iC0OyAM/HQTnjSSB7c9RKIkqt/NQXk94WCRLzb/jegz6Qj92O85FPUmnw0N6hLA8O11ZuPpfa7HiepkMr2Izd9fnduH8oHTBzN9bPTxW7f2F4Pz2ZzFR2WD+KgbVwSb8M7ycJJbHxAsD2aPzMpiuGxxeWZ9vkfkNPuRcg1qp8DEuKvYwfL35892FQYR4ao4Bg2RQXB0BX8cwowm+zBI8UvVWVSgnnHhHSTpnLj8OfvqEWlt7hWDtukLtjxtwxBAIdR6VUigKmYD2QcNDfER9RetIIHfSWaxyErv9qKAwB4Zw3qRZ/qawQdPM15/293UcENG4xUjso13y8q/lwwq4E9u4KNnEw0xkJV3Sye0IkSHex7SbIOa5Yb3q7JmcnCw7KIzTwhdMrDMfWWdDB4hYWvTnPctPCUoBmK5Ln449nyKG4W3niYGV1QmrI2dwO7Uj91MkYijtRIAExFnvfRzGPbQBpL4ZdC7zNxQsQ4sAhvpsew0/BT24Gxb633fn6ugj5UQ8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VsZhtK680ONMj7XSc3DwBTmUMgBWCkAKJsAOBc1sEIGWClEvQMJMnBP4d87QmTmRjvzaWfhBB7sgfGw7qBZH2kU7pVUdJoZg/7le5xHYyEKjvRSPIqv3gYhR6QHPCu8ibf4LxxVghWxOak8WKT3LLfwuKgfJ5zthZzGzZRTRuL9iFDef3HiTHTaUGwcWMHNL0dHUpcWoN7ubpReDG5+KsxAbrir5F2Q0LmhZe3PXS/uXKmBbdazDpjGupKyvzLCLfleTFNIxrpMqpA3rtTCKF1JfhXtzPGJavbAtpJPPQBRiANV3u/Vcg8gCnwuXCClCcyPdkgkuZHA9na5wa1JAHIY5KGgSQDFnWq6DmOTLxh3eGuwChHiqOV7KhVkl+Hi8OTtndoB1D6M+TGSGXQIiTpja3ZlhqA2PKYe0pqdD5/GBz86waTuXjXBsCpma36oJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jdU4Lo4gU5HVJ8SUbOHQrNMZfu9bLeKe++gyZR7sq2iTpISos4BJM0B9b/1V2eI4Xf0ja6P59moFH7o8KQJUhmBw+WaSmo5TsELvYu/u0YjEOR4gqM/9TUx5kiIWKyZmt9MXnx/z2ryADQC/wytOZQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf8b2955-088c-4aad-8a8a-08d9757daf8a 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:41:32.7951 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 09/39] avfilter/f_cue: Deduplicate AVClasses 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: 2mykBB2YheiE Signed-off-by: Andreas Rheinhardt --- libavfilter/f_cue.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index e87b7a67c7..fd55e4bf5f 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -94,10 +94,9 @@ static const AVOption options[] = { { NULL } }; -#if CONFIG_CUE_FILTER -#define cue_options options -AVFILTER_DEFINE_CLASS(cue); +AVFILTER_DEFINE_CLASS_EXT(cue_acue, "(a)cue", options); +#if CONFIG_CUE_FILTER static const AVFilterPad cue_inputs[] = { { .name = "default", @@ -115,8 +114,8 @@ static const AVFilterPad cue_outputs[] = { const AVFilter ff_vf_cue = { .name = "cue", .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), + .priv_class = &cue_acue_class, .priv_size = sizeof(CueContext), - .priv_class = &cue_class, FILTER_INPUTS(cue_inputs), FILTER_OUTPUTS(cue_outputs), .activate = activate, @@ -124,9 +123,6 @@ const AVFilter ff_vf_cue = { #endif /* CONFIG_CUE_FILTER */ #if CONFIG_ACUE_FILTER -#define acue_options options -AVFILTER_DEFINE_CLASS(acue); - static const AVFilterPad acue_inputs[] = { { .name = "default", @@ -144,8 +140,8 @@ static const AVFilterPad acue_outputs[] = { const AVFilter ff_af_acue = { .name = "acue", .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), + .priv_class = &cue_acue_class, .priv_size = sizeof(CueContext), - .priv_class = &acue_class, FILTER_INPUTS(acue_inputs), FILTER_OUTPUTS(acue_outputs), .activate = activate, From patchwork Sat Sep 11 23:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757519iov; Sat, 11 Sep 2021 16:43:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFwyNQ4+IWFFmo8Rw8ObSKa31ZCgG9wfFPelgVe4xcrLxxRjkm17wpeixCIdp7TkyQ+eF4 X-Received: by 2002:a17:906:3746:: with SMTP id e6mr1822648ejc.57.1631403804525; Sat, 11 Sep 2021 16:43:24 -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 kx11si2842279ejc.554.2021.09.11.16.43.24; Sat, 11 Sep 2021 16:43:24 -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=fRYDbeBp; 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 43BF468A985; Sun, 12 Sep 2021 02:41:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5146A68A8CD for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OHQCWt0h0hMvX+ZLVG+Go45NympJO32DqzVI0JL+d9k9VsdO2S0FG6uzrcZKd5auQGkvfQha5SMO4kOkVtdld4uzPBGiSzPBW24IFVx1I5WVZkArL0aYmrcyA1zRZx6/KpHtpe/3aJ2lJchjkpAmxHRtmsVifsFPEN2jJ1NylD1aZukhUGmADzvHuej+2A8KEmFensCqjbKecnB291UZQUqDZSCjrby9OaqJHQNIgeAN1fBInvFCDnN1OSwURGgzPpbDB3hpyQyCS0yEaYw4g1L+x+u7lW2+nU8s3a/wlx5t04g/niGh7gMsOQGAU/SgHwkNj4Km8ISyd6q0lbBbXA== 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=XY6ggB7IG+bLhyD8I0JJTxYnm8i3YGOt/4E5/ZyRv9o=; b=WKxmAdPXAoKx38QGFkvhHg8a53AaUXM+xCp86QIpUqBOBwm8yIBOX78h5oGyJqJCYA0eJpME/Xz0qw1UsyafQ0n6fmgRFd1y9YGy1FvgHfyiI6Y1CWMTtz87JlAQnUZ8J/MyWXHVb1ClE27xQVfshsegjNFDRBIcSFfo9GMaFBL/ralRBDA5dYhCUfHRpnFGk0NFgfGzCZCsaMnFLn6DIyWJeBJrDmkecFiA8ea+GFE/pOxprTRo+o3SAQpLT5hdQOkpSUrhrXT7x68CbouK8buJD99Foa8TDr1Up3avUqx6VLYJwrBREy8dBHI79KyyfQag9wo5kGyz2YYzFY0YKA== 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=XY6ggB7IG+bLhyD8I0JJTxYnm8i3YGOt/4E5/ZyRv9o=; b=fRYDbeBp6vfMEHTF8jwfspFpTn4iqmX8S9Tlzi9wq5Hib+24t4hDk1Y62MKk7MIzw8VasbkvZXE1FucUiVKBsgyRC5UNKZBRh7clTBttMH2uaJmvJxK5XJPFoTBiwfgLK1P0ITcHhfLU0+xu9Pl8j+btlU9vY0sZJByYpWzqSdjugdiMUsOHwJvPL3DyLcU48M5FBtTccZ/i+7uXZWqHJ2DOqb8XQauUleiavlwWeWGDGHq/2co7jIhoXWJNjSKwfG0HGw8W3Cdau/3zvdZHR2b1+z+WXROU5G3l3qhZAdpocSk3vwzX/+/22QF08AmHkHhtvVfu0ZfiZZadN1mdWA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:33 +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:41:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VDTG10LtrARM73zvrKBO+SSKekG+ZkUq] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 515d395c-4a0b-4330-4f7b-08d9757dafc7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIaLBjtu7NrrKpKcVylKBvd/ixyZu9WbOlIa0xCz394HvjQIswIsROtecR+bFOsZoshXYj0/df7YKjROInEY3OHsfwbohQ2LdRuEsYEqPp7VOrgDpyIXrfvkGUaW8JfjLs9TK++ow9mUxkdHNNKyiq8tkOu9IeT6xUxtVxUyYVDJKAju89VXqGvRBFa6Fltb0yetzOxYcSKtDG4YWJsPvwm6PSDuR0/fQ5PGYWLFAk2t7AyB8IhRObbItgR8t0awcP76JHGqvunuZhoCullHXr1DznRmTh6Xttp0O2og9q1UDXiXGsSnRGgUqeSjIrtrzV5dypnHVswqlOreLkm/Vg+B3BSxJ46k8ykxzshh2xqTIZ8UIMwGHaYVvQDJuybvJa/LycPEnL6TAghMwMMcAA0GeOL0As7c7zKpFnCDKR9snXjBkhnq2ynQDBqRu1y76DQyjgQB0Pi/yvGEj6HDf+i8Hq4fztvTn3mSc/l02UJtx76qG+/Z5QW9oIvwDby4MgIHTzwVUV7THfyoyQfnb8TvTxBnV//NEPpkntor5c4ZIIx4pW8oJ88sN7lk8y4tHjGa/J/V6ZSkVK04SmnBBL9YUQLzA7WzQouT29cBoK2i/eNdB2n5UR/6lMMCiFAnbnXWTHO710sgmATucP+BuqhMwqvQlizef77nqVh1tq8xRdy8bcIR+ReE= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3c6DU5gIs3nlCQWa32O2Lhxk8fkdpiulBwsUK0xNBNs4F7hOw+uvNserikq2aJhuGCaw0aR090D3HMgfK1IrsOIuENUH6Wvl4kTDtv6tnjYEcA2llwqG13JV7vM5QZUwKw5QnCJDDUC+iNEoyTeLiLmpWm05KXyVvzt2dpbd9wwikabQkziEfxVjNhCdUmpdV9tGV24ClD1VBfSJ96sNzcMP+nl21BJubuT6xXLXr5fVhMPOTRcnrBkU3vkQ8p74iACTijO7+uj49gVG0hxVLYESttJFaYGFk+2+MQt4aWOqLSLvGQfUpxfDWXvOjkP9hOOPhPw7jd+2hKAurHUqHt5ksfdbviykhGCpK+9KQSrPl9ACqEK/l7T5khyWi+KF8wdTfAOpLFf6cvicysrHHNemgHUgXesxLuZ7vtgGHyv7Kp9D41ixYVL3rmAdeX71 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dYCozB9KiPpgwHpaLP36Ru+dhcW6ZW/IjovxPsGVwJXRjfuEI17OhL6wdxs2/yVt1A1HakjiBudVlnKXUuZUd7+bV+6qBGDLqcyLpj3JuP3peVXIT3dTV+yhEkPbG5/vaQ2T3W8kMF67pgQqBlpQqA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 515d395c-4a0b-4330-4f7b-08d9757dafc7 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:41:33.2013 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 10/39] avfilter/f_drawgraph: Deduplicate AVClasses 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: jT/soGcfHIZc Signed-off-by: Andreas Rheinhardt --- libavfilter/f_drawgraph.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index a9b47483ad..9996eb3b0e 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -84,6 +84,8 @@ static const AVOption drawgraph_options[] = { { NULL } }; +AVFILTER_DEFINE_CLASS_EXT(drawgraph, "(a)drawgraph", drawgraph_options); + static const char *const var_names[] = { "MAX", "MIN", "VAL", NULL }; enum { VAR_MAX, VAR_MIN, VAR_VAL, VAR_VARS_NB }; @@ -450,8 +452,6 @@ static av_cold void uninit(AVFilterContext *ctx) #if CONFIG_DRAWGRAPH_FILTER -AVFILTER_DEFINE_CLASS(drawgraph); - static const AVFilterPad drawgraph_inputs[] = { { .name = "default", @@ -485,9 +485,6 @@ const AVFilter ff_vf_drawgraph = { #if CONFIG_ADRAWGRAPH_FILTER -#define adrawgraph_options drawgraph_options -AVFILTER_DEFINE_CLASS(adrawgraph); - static const AVFilterPad adrawgraph_inputs[] = { { .name = "default", @@ -508,8 +505,8 @@ static const AVFilterPad adrawgraph_outputs[] = { const AVFilter ff_avf_adrawgraph = { .name = "adrawgraph", .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), + .priv_class = &drawgraph_class, .priv_size = sizeof(DrawGraphContext), - .priv_class = &adrawgraph_class, .query_formats = query_formats, .init = init, .uninit = uninit, From patchwork Sat Sep 11 23:40:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757440iov; Sat, 11 Sep 2021 16:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSza104aazvLcpkE+WxndI7AbMsx0THuv3kLMkukvTNyEkJAV4Mtk7Gcc4vxFALEwbwdku X-Received: by 2002:a05:6402:299:: with SMTP id l25mr5259339edv.343.1631403796903; Sat, 11 Sep 2021 16:43:16 -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 hg10si157333ejc.344.2021.09.11.16.43.15; Sat, 11 Sep 2021 16:43:16 -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=q9ZOmykN; 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 39F1A68A970; Sun, 12 Sep 2021 02:41:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D4BF68A8DC for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fSAm2FszJLmRnqjKF/VS8qTgpGU+1V7l/P1ra6QaVSxtQ1WAib7ubYFVTfEAFadzLT+0Y7Dj6yo7j+4sOpI4njJ8EAotkP6A9X0Dx8RTjo/0CMTm3y/7pQ0hwNO8XacV0W9SJlUBkKU8ePbVoTajUrAAhMaTS/L5z5iX2AoLMRGlb34foE5bODjVL3VVcylTrRnI2pOeEOXOZb5OOov+EImIUIndMGR8+dmBmt2OX3TGSV6BJYY+Y1uzIqJykC7VVHHD7XUjeyuR7R+fblGqzuHmb1FrjZk3uoioemjtTIe54Sl4ZWWnVpRUzHURStfsDsjM5hRKsEXbFsdWMm7wag== 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=CJEE5y6uY+z4MqbnCO66uFzaijTvF0VlltVUF9PxglI=; b=PGghuYgtDuE/SPHlAEMkUm/2YYbgptVNV3lo/uhliNrD2JOpK+SRcCYhVeU9RmmkFp/O0JMBGzGSAcQ/vJz4w9KGTIJ5Y9El2mcd2OPIWXh3+ZVHQVB1E7KK3oExMaWuFMA/aWovRBe+eILpbjsaqVj53Y4Og1lHDAhjv4Npv6Hf6HVX9VLUUJhSWRhlJZOj8xqihbpXTKfmZED4/cBXD0iEAcX9E+Bj0YTYdFzOu45RRbN8Gp1/G4ewY25JlvKyBknLF5r9Bq6ATvZ8owKXe7NPsHs5A4yYnfZ+I7tQ75SJN+KGIlhNGdj8O/0KALwo5ZbdfBxB0Q/RQhAWKk5nRw== 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=CJEE5y6uY+z4MqbnCO66uFzaijTvF0VlltVUF9PxglI=; b=q9ZOmykNmv/kipTXtqXt9XNwYUEH7SH0IuJsHmiE0qubG5d6bH1Cq2md9aEm+TBPDfFIXGW0PS5kgwD69yln5bmH1N8+P2pwaJ9ewrTNQ8wXtBMDltLRcz6teS90jblw9Mey6c+RAA2O3Ep4Np7n1IBBTC6e7upUMKr7L3bgcm/nU+JR5xYWOGGYvjyjTsPCbr+OXQyxOMGtd8XJjXVnwarid2OFOOxXJGC7MEC0TKTtJvrRKp0u1Ws2EDRXoeeZzQxAVb4zQEBakL4rE/q1JesCVFINk2nIB+qDEqppSX5RaSazt9z2NPwv5wDVbi/zJy7q8qnXgPpu6U7sMSdqGA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:33 +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:41:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rBkUW2sQ3J5UBrx23hSUDhX5aPQ70+s4] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1fff254-cede-47f5-c040-08d9757db005 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMP6UuXRiXYXfo+LfCjtPBlS59jRq+yMKbmf12fwFl7qMPsmboUNrm/ShbTw5o3O4eNeBrGlefyZZD2C4qChK0aeJQNkCtHRSwB4/8Qqn+KIbmD3qsBHZ+ouzb9aK6I/KqQkjHEH7cVRodwkNoUKalNFaguEazSOal7xZWlMCye0nHD++2Noa//dtPDG7Xekkj1Q0RgxBUWybSveJ0r6hOyRH8L84sZcM9JaVj1tfiLelxwgNZCrE8iwJlyf+BjdDlKnUDDnL/PpGrYL6HtIXbVjhb1wo9wtyPWN616XwdhGWy2bevcrg0aZZ1OaakEVhnKF1waPZWn8Dz+/Y/EUNzdI9TZofnAANOhT6kxTgHEFWFskOxjAcoQrKu+Vtu1e51jptzp6cLhNEKp656/vE0snq6ExAdFaj3vV93dCp6fjrhXQItbrOn3hXbvPunJNi7L4X0BeO3XG4i9oYvnf2i3NbRniYTmCrEk5lWDdznXy8zcFU5qkIaBAOOvA/rcPKgJMA7FYmbQ6YQMOs6hr9tjijvIJT1oNIkjwX1bEVpiLWDpdztRRnEGHfUKQ3OaNM4QHfO2guQarjn7pXWZwXmPu5Qd2KWxrDN0esdCaWrO/SRw99TqnmDpzKv9rj4Inbtsf75JImf21tHTsoUMqawKk1RnQVOizs45HcPr/s3lapFebbmXr21mqUoOrFqd4/x3OaHyNc8oj8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F6c54KpY6hZkJ0/Kd6EfaAivHirgVosarjhywXmH5RoAh9NLGbQNaEDAgocNS1CoVeDU+Iqd8kvY8W/W0BgYs8VkxSqp7MGYwe47NOqpqoaYpBwOPp4yxdTkKdO+c5ng3tnXnJLuDoYuJyzDaXA2aOHEg7itGBIzJlboMKVVZw8wMZlC9h4DMAK9hVYjXjlDaM5lillB3QkTeqKcMnAlyOShv7lKneQ0aPQcq5vH7J3kZ2NGJ4EeYyUztZV5PfImu7EDRqPhuZ2JzlT0WgTmlJNly+QGmqx//Rln3wkHzyusoXjfetmJyYU2JhRDr4iDoGoATiIppeE9ijv6zEG4nxf4y2DSBSQO7rUwosJYlRdHFu4Sv6PwKRRhywc/a9Nlor2nRIePYwf9aFA0WJsG8qYpzf9OmYXGNE86GIMAMMLFUePneCkGof9/RSC8g5r+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QWkA4is8zP3jrJs+j+jxxWKCXdf4cMQspwQT3nsscYBIMDhb9LsdsqqPZ3fpsdodwn/WINR29O9RA59/YpZbdSb+L0xMIcEZjGqL2Y0OuDAP2O66O73PfyBrrSN956hXeqj8hKvMT+KS6Cjg4/3jtw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1fff254-cede-47f5-c040-08d9757db005 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:41:33.6275 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 11/39] avfilter/f_graphmonitor: Deduplicate AVClasses 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: 1EWlxto3Mqkt Signed-off-by: Andreas Rheinhardt --- libavfilter/f_graphmonitor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index b712c2fdd6..de91a863c2 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -386,9 +386,9 @@ static int config_output(AVFilterLink *outlink) return 0; } -#if CONFIG_GRAPHMONITOR_FILTER +AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor", graphmonitor_options); -AVFILTER_DEFINE_CLASS(graphmonitor); +#if CONFIG_GRAPHMONITOR_FILTER static const AVFilterPad graphmonitor_inputs[] = { { @@ -420,9 +420,6 @@ const AVFilter ff_vf_graphmonitor = { #if CONFIG_AGRAPHMONITOR_FILTER -#define agraphmonitor_options graphmonitor_options -AVFILTER_DEFINE_CLASS(agraphmonitor); - static const AVFilterPad agraphmonitor_inputs[] = { { .name = "default", @@ -441,8 +438,8 @@ static const AVFilterPad agraphmonitor_outputs[] = { const AVFilter ff_avf_agraphmonitor = { .name = "agraphmonitor", .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), + .priv_class = &graphmonitor_class, .priv_size = sizeof(GraphMonitorContext), - .priv_class = &agraphmonitor_class, .query_formats = query_formats, .activate = activate, FILTER_INPUTS(agraphmonitor_inputs), From patchwork Sat Sep 11 23:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30157 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757663iov; Sat, 11 Sep 2021 16:43:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWuTRAFut24WTn2Px4uTQbXjeSiA4jc/3bdpKPbjt19G2/WQPOVIn32uiO9/s2cXQdUrPi X-Received: by 2002:aa7:c7c2:: with SMTP id o2mr5348871eds.166.1631403821953; Sat, 11 Sep 2021 16:43:41 -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 a3si3202131edn.396.2021.09.11.16.43.41; Sat, 11 Sep 2021 16:43:41 -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=a9S4cVDl; 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 8EAB268812E; Sun, 12 Sep 2021 02:41:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AABA68A8B1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEEo3jGbQ4QDuFSCSR9tBC4OwUklWhYQNJ0/h8jYeyi/Dgy8qI2AeaqeWHaiQ1owsR9Y7OltYEebtX26bpPuiCoP8jGBvdnludEequT7Ap1EdUeI/PkUO6bNyR/YfbVwVvtt4MwbUkq3xdOAEgL7ilW3Hq9VV++g64OJSt2dz/rNEnczbZylCf8SlqfJRZzrDMhvP6OzBVDWUhD+7964QDU117UOtxCzshSBDSkbyZdCP2LMET6EltuR91u/i+4OzugKYbIkKPxbqEqptGVYiajNpqu+n9ZUap11vhFSohngk1ycc/pkIumhBwirE5YafK8hCz20MUYPXJN/fno2Pg== 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=s+f8Lctp0hirB387MLMZmdYWBuGn0vDUFWXbNs0zoGw=; b=Z6HmZozm4NB3zmpDNWUG9Sh+dyQeLnV+Ta95pr2MGp30lckMKuXzOsmblx9bxE+Yh00OiJpVSMQLj7LUtoRcA/jZj1EsjMKXZwAqaXG+1+/PP74GBxnbD/T2BhiU7VL7HhnDpZy5s8rkVHDiTexxCSo4LR5H9vyOpJEwM59TeVAiLeZWFazEEiqLFbX3RhJkCu7tPmRREwGmMhmlwBvQPB5yXfBrxzwUgp4DHVmLTUuGQusF6fpZWGuoYPqCf3u0+UsgMumxdF5zIqOLw2nQRDkMAzp5iQdctMcq0dF5o4EaRCeuVPx4EKJ+TtxGbQZQhx1wRFWFuO0SWBd3Rq5OBg== 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=s+f8Lctp0hirB387MLMZmdYWBuGn0vDUFWXbNs0zoGw=; b=a9S4cVDl+8GkLQrKxw9CwQ/HS/jjEDIY2Gti7gG2vsmwfbRobK7/ADoM8OC+SKTzfOuh8Dl7MTtP++SxlwSCBAjVvocZQjutRPYH3j9ZaffPQ5RXe84uQKeofFdE7SR0L+4qD5M+mZNIuoSj0wyMD+2sxRklNgcjTBdu5QzXVcEGh3IAWmpfxjJK3z1j4v7+BeZhnmzPw7H/EhLRxoP1In4FlC0j6+WUZAAx00Ss/uIiUaLUyKkgDB2PhllIgOAfJ///RlfYS7FDsmYJIBJvUMWCT/tby5cShQhc1nfT1yM9iuquVhr58a9MH52rHt3lOZBijoF+XRVUHL9FMraEmA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:34 +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:41:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VxrhkgAP0FbsyvgWV9NEZ7SfadimszGA] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8567db5d-904a-42ea-a5b0-08d9757db044 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMksTRFWjkHU2ce/cyBvv6mOmmQQZy/u/7qw84/9E1NEbzCGw3fGfqW8kPQkCKELOQ4tpWH0WjXw/JKhKF6+w65rWqiGhkZSCpuKPUAt2JgeMMJF8n8RN8FmkSN7ymPfPI+CmBpLjMQhgapkYf+nbt75QJkKcAZd3ckSsaPh8Hdw2HXas5DFnrYnhRx/z2z6hGKMW9LNWFO+JToannOOiR8cZ1AzI7P8y2uJf6h1iNX3xaE3YhO4rWl+VxtXCkcmGEzV9j6xQz3HzI0sVOlt4W8w2CuqhsV6yLq/2RkYN6XB+mXUb5FPlgviS+j95B//rq9hY7UuF/AS6+/900B4JUE8ltMIhtINKQMjUpbmpYNjNcCkei4VBwSQHVIgTHUhYdEaP8IAemxqtAHdfdCrli0Bqhk3Llh2+44VrYhQBCSNSuQ4GY2G6FjNpfNQm4AtsDK/6nGNOz8WwppZCWxqAuR1kKA9bMSPNG/6JbWkqLd1mwd6JcIMJbf2qL8EIXIJjJL9OnRR/qV6v6r2bo2ibTEVfU0VP6rrwK/4N2jco3n2nDJTZs8dZ0N9LlZ3/b7ZVW3CWIQvUP2klzn9gqHUffCROFZD04qyKeQ/h0ewlc1BxCnKms5uRM7ijwKN+Z5X+33X2L/UOLdsohJdWELAE16SecaITwBjS0rqmxZlEeQ8Y6Q8eeLkm39IUBTQbcyXx1VZRPKx5oZqo= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3EM1AOWguhvTQW6OohwxkYMfK90naDmG70uQz+Hmjg9ErposdeBZfAimqPT7szOpGHAC6VQUhN61yni+k28sEKYMW1vzZQhSUtFdp1xXrqEIgvRZQuDJHvxF0DBjOMuvsTTe0xahAb+5V3JsotxjpZOeK1IX6Vliq3ZKGTJtKTGF4DTFGbOd9QK2yG0BPF4j223o7SbNo5cbv4lDsRkP9HY8QWfNb3vlNrQ8WOk9vnEX0MwxU36ktZAYH8YW7V1WT2zqBaGogb0CliiAGgGvQyIeRfXFvToKUOtPi823ALJDKqf8tpftvngvkzYm4wMEHUNXx/rkgVoPtuPKSc8Whqy+uPIptTULS73c6OW3EIKG/Hykq3WpEuZSeh5EvTnoofUBk0TTBxllqvwUX6eLoE7eTBKoZ5Yb41ceB2exb40Qr5Sst4Pd0TqTB8dawE3g X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1o16BdBiirq9stN9yM1WCLB/cRPNzcQtvALWAf0MjG+hyNyfbRSY1Wy+TWLH7OHXHNjgne72wFxCxevFz51WL2fmEDzMvteu4J0OreT/WbAPUh1rtgBQBCzPtBXsVbOIsd+wUdcg2oJj9W41T7D0Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8567db5d-904a-42ea-a5b0-08d9757db044 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:41:34.2856 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 12/39] avfilter/f_perms: Deduplicate AVClasses 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: gkZGroyB2NFa Signed-off-by: Andreas Rheinhardt --- libavfilter/f_perms.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c index 8c449fbdfc..470db45bee 100644 --- a/libavfilter/f_perms.c +++ b/libavfilter/f_perms.c @@ -111,10 +111,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ret; } -#if CONFIG_APERMS_FILTER +AVFILTER_DEFINE_CLASS_EXT(perms, "(a)perms", options); -#define aperms_options options -AVFILTER_DEFINE_CLASS(aperms); +#if CONFIG_APERMS_FILTER static const AVFilterPad aperms_inputs[] = { { @@ -134,20 +133,17 @@ static const AVFilterPad aperms_outputs[] = { const AVFilter ff_af_aperms = { .name = "aperms", .description = NULL_IF_CONFIG_SMALL("Set permissions for the output audio frame."), + .priv_class = &perms_class, .init = init, .priv_size = sizeof(PermsContext), FILTER_INPUTS(aperms_inputs), FILTER_OUTPUTS(aperms_outputs), - .priv_class = &aperms_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_APERMS_FILTER */ #if CONFIG_PERMS_FILTER -#define perms_options options -AVFILTER_DEFINE_CLASS(perms); - static const AVFilterPad perms_inputs[] = { { .name = "default", From patchwork Sat Sep 11 23:40:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757588iov; Sat, 11 Sep 2021 16:43:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuI3j7/2IOFhg49GrwOlUwcnOD3Uwph2ohg+3eRu4fmGeN6YBBTRFe8ixnmcnnNt/iB/FF X-Received: by 2002:a05:6402:27c6:: with SMTP id c6mr5314537ede.111.1631403812893; Sat, 11 Sep 2021 16:43:32 -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 r9si2691510ejj.752.2021.09.11.16.43.32; Sat, 11 Sep 2021 16:43:32 -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=mbQin+gz; 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 4579E68A8F1; Sun, 12 Sep 2021 02:41:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 745A168A8DE for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W+etOEoHVgE28LPBMSlsWEtqEYnoZLUpmlPHKguzvXaImTj4Lx0Jrg5hFXXmQiRm7rE2pgAxv9IgFu37AIRmJThFyMSX+v5JiFXa//WGM9SXBesjLvPIis7xsR+B32WKvilv1rYWbKt6YrEMmQmX/tUa81uZhDitNhKPce1PVXck/nIrXLYrhd+AFgpyIH98oM/w0cJWjl4ouEiHJY6YJw6LhF10M+mrl2BYr4epa0A4C6X38ekWT77tdJUH7rBwJ65TsTA0pHyBdONXidEGi0GWilAR7HLHJzHbUe6tHshMbWYGOaOyTVJomeeICrJQWTtzbWmpAwUWshhILaUNEA== 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=GusfaSsIajIbGqtPHtLb1OH3bcqcIS8p5rJFlYDbGMQ=; b=kvj3zmOVyasYSrRN3vAx4tPxQU56OmDiRAK9avGxGmCN8A3i1hPjOCjzWYpkxxQwG27yXoAc95mLGZAsWHDAa2hQvyOiA3YUD7XB/JD71UoTn7MkAHySDvFW0JidFKxbD+Ynh6dhQCyo0EI6aHP3oJXtVrmYg8npxCplgmC3HUACBkIW5jBXw6zrFQZUpt8Myq437WNOEa1+JeVsz0dIGgYfJc6KI0UpER8gO90XBeMmEu/i0eRXVbB0RfQNbdMfJG0BqPcLNSo2Om3zWhHpTHH+VlRI0mHcNDYpFGKJJVtzmaOa4Up+/VKawZH4KiY/m37TP4aH1NoIEmh2IIhPBQ== 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=GusfaSsIajIbGqtPHtLb1OH3bcqcIS8p5rJFlYDbGMQ=; b=mbQin+gzM29Bkkt+jQqGkRsFQskwTK2cw1TVdwgoMfpD5c1BnVaODeYdolJLqZHqLjvz1A6uptB0EML6RUcx9ZEe/DQZwAym/laVhm0f8XCbcv3nb2XxBXkUtBmvPv0A+MdW1qZR3leS74vsf2Km+f4YmUN+XykWv+RJAyFHd27tDIetBkUeave+DlHpN015xjrvvBCLPGEPI+kf8yNAZWlFF7y5hJO9unCiw4WfFX8oSRot00LbDtQMXp0Dd9J7GrqQLbK4MVzmgZ1+9OUHcAHAU8tK4FGNTi7y6k0IN4rURKSMKeROk/XJHPj/Ule/g3g9l78K658w0CHdiYtSSw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:34 +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:41:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1FkJk0YT2KsoC5A9/HJ2XoAXX9FyRXcC] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09a5c8fc-e544-4ad7-c728-08d9757db0ad X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIT9BTNg/ZEFGjlHTwRfNARSAutFARVVduPhBQs0XLZbvEV6I0oIc8aRQO7bhzAG8No3OVIxoi6tK11bsyJsJYoaXHCAAGyBWMBxCYLMO92/8d7KTKAlr6Tv4TRiR32rEmE2CyLS7DP3khgtk5wKAIyg25RrlYUGiD/EMtRylu28bPMNpEx8ilLPb38vtww0spTDonenHLDEQmmbwJDXC7Dwe4oUBUPJD/IuXIwgy6UMNNlSmJZ9nl16xtwrNkzEadNlE2BUAhdfiAFswbU3KzMnTq7CZExXurjwExGaSRjcv5dncoa2/xkvvJCNCbqW6KTbiq8mzfLwlXRxg09V77x9wd90OgRNqKSCJKKfu3QihlGr7hkyoS498k8nDVYA+B3MXJlBA4WDxi9sSfqlny2n476XP9WDD6ivrHe1JxA+IUesLohcWXBsIOUzEfF7lDcKLfUGx71Je83RA0xcRDzBPqsd9LlOtMGBl5tQmq8pdZv1daQamJvypUj2+2Ju6sRkqodGf/K+JTTpLbGSY3NnTKhXznxtWERIhTwanM/HytipNsl34+0fv+V19Mt7V/aowJfvcBURcQGpSTbmn4nTLJAurU31J4yHQwl+JeXV9w+VIPHdnltPeWZO4E8zCPUScLT8nZwPxh1AUvY2scngg1838fERxYJnrJMVorf5xm2i9tyDgbEM= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q+prpqoKGrhtnEsf9BTJniMVuSvYsADKzZVwIj7UxqFgsxDYvCWMq7yNhVg4Bx7oGRIgLoltPFrS+0mEEXYbl2wTRvF0qAsA4RXOFK6LkvOHWwZSMw02ZUWlt3b/2b4i7vu1622kPUC4ZlSLilnDWPlfxmxRy7sfGt/5UVOqSBxDtn5UeYjvN3tZnlh8FxNj2dfj0dCvWSN2vkDn0UH7sp1skpPuulK78EzCuQvm1uHK1vjxanD2CouSxwwqAqva4s8N3bcZv29OXyXBhNfKrg8QvsnMY/eZsqbbaWgezvVccEw8nV2qmRFHuFxZmTBctyXKn1Cq2RaLS43ZuLYQOXS4gsYcqnEhQi+2dXvimTORoTcMPHwpoTd8zUWVKNwwI51H8XoMJ7YxD79fGfIrx8KYEZW8fKhQmHMmafs/qVk1vMBJtl/Y+KbUp/7ui3ev X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R/z6iX70w/yz73cD71ZanMGsoQym6QJXqCeTp/DXU8zg9v8NXH5JFXByUg/vaNYr/AWQhalIt42SCbrsqSEAYiOgXUDma3eqLmB8uDquyrlWv5SakIIqpKzMNkU7ZyBAdQa/X6jGwPWEJtdT1aPtXQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09a5c8fc-e544-4ad7-c728-08d9757db0ad 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:41:34.7267 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 13/39] avfilter/f_realtime: Deduplicate AVClasses 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: +gpsvOHAFVgW Signed-off-by: Andreas Rheinhardt --- libavfilter/f_realtime.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c index 125bd6131c..11bdb058ed 100644 --- a/libavfilter/f_realtime.c +++ b/libavfilter/f_realtime.c @@ -71,9 +71,9 @@ static const AVOption options[] = { { NULL } }; +AVFILTER_DEFINE_CLASS_EXT(realtime, "(a)realtime", options); + #if CONFIG_REALTIME_FILTER -#define realtime_options options -AVFILTER_DEFINE_CLASS(realtime); static const AVFilterPad avfilter_vf_realtime_inputs[] = { { @@ -102,9 +102,6 @@ const AVFilter ff_vf_realtime = { #if CONFIG_AREALTIME_FILTER -#define arealtime_options options -AVFILTER_DEFINE_CLASS(arealtime); - static const AVFilterPad arealtime_inputs[] = { { .name = "default", @@ -123,8 +120,8 @@ static const AVFilterPad arealtime_outputs[] = { const AVFilter ff_af_arealtime = { .name = "arealtime", .description = NULL_IF_CONFIG_SMALL("Slow down filtering to match realtime."), + .priv_class = &realtime_class, .priv_size = sizeof(RealtimeContext), - .priv_class = &arealtime_class, FILTER_INPUTS(arealtime_inputs), FILTER_OUTPUTS(arealtime_outputs), }; From patchwork Sat Sep 11 23:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30159 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756811iov; Sat, 11 Sep 2021 16:41:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhlffcy4+KOEjQE2enw1BMIZF1vBUIWNE9e+Cc8+SW5AS00oiZGXCl7gA7r3+5XwmL0IA8 X-Received: by 2002:a50:e795:: with SMTP id b21mr5600654edn.82.1631403718632; Sat, 11 Sep 2021 16:41:58 -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 o23si3015733eds.422.2021.09.11.16.41.58; Sat, 11 Sep 2021 16:41:58 -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=gOWVRxJJ; 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 F035568A91A; Sun, 12 Sep 2021 02:41:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDCA568A881 for ; Sun, 12 Sep 2021 02:41:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U8vZxTOT8SoU/X/stVGJm39H0MbRiUhHQ8X5YlLlmFul7Rbw9eYQ+iagR0Q3Qvb6BbN3GqSu0cKZYplTaFQCBa+ACOByNVbK2y/5XQDKNHhkPkRAS4sJ3xCNKEzLLNlWEypH8YzrtOGlF+BNOvA9TynGTR+HGgyTXCHahdaNKCvK7L4jDHmL+eMna8jtJKUATr7iIU1qIZ7ZHPB/TDe10ufX6cVFzf3l0BjtmUElPJLYJSDxa2fDrhlLyQxEogsPJ5VFGyoTR52Dlr9Yko3ofdlXHcXUF4BtQlNyk9IQlRbb5c20Jkwhk6tGaMENYRWvk/E9gKMgob4HPvCDRD4+FQ== 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=5EOelE7no2KvURGLkttOB+4f8qoSS8KbudBRqy4OY84=; b=LXJX2nwQ0MAEdm+Zw5jgG6wWudjwJ9PjdvgQJyH2LvAFejWG5tGc3WZ/D+DSK7MH5khkJj8R0SbWYHoJi8xTn1N4mUyv1LBgfcVGICrPTE8kQbYQNG+sRgI7IHO/60uEnlwqvoEboj93t3Q45z2/8jGDB9nIpFpjttXPuX32D2h8l/2l9I8jjqyziumU2eqz5IQP3EygPelPQG9o2aC351/+vViX9D1Y8YVQBqTo7rNUVBTYAbJt4fo7p+8sCPKG21lyjiDmDV7z0EzqRZNqj3cljbQztYBP3Nzo2K85zg2rqdQcDbb65xN56wSN1fTLYTZuvOOPNhzrxjBDGpe6Vg== 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=5EOelE7no2KvURGLkttOB+4f8qoSS8KbudBRqy4OY84=; b=gOWVRxJJYGGplIPZSQ2FJ7dRR+P+ooqmtx5Sg70lgARgqF8sJ24kIwmq4zFx5NNmb5F4AT+ITqngikzuiCtpcriyhVxrmNiXdYWy8gbRaVKaRgfsEex2F0IX4H4ST/gEZqkF2ovK5/0lWfLs0oDpql77nsaz++lBBtlyhvExI2n0n6AMIE4wKM50re4m6PLijHdTlSatS63mGPJgBz9+cKgNb10055MTcRSgjvGQq7BYoc0kJ4XtJLO5HIQrSPpg1RyNVz1k1Vjbdzb/NiYGNSN3b8Ujy1n7xOs6am+0hpghDsQmwNyp+95R5OHh6YTUvy/8hXTYd6SSlqAiTHXe4g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41:35 +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:41:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1RSxJHB4D4GMHmRpxmz7h8/1ttGmA/1f] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98c2b03f-703f-409d-e3c8-08d9757db0ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIRpobDIMxCQVA4Xav/QwYHDwr0HbivQTooBvmKWzSkknia3h9NlFeSbdbViJQUggNpX3G2JTbW4kQbTnAQ3RfOFgFpA2oNopyHhzM1qcXePTCqLX95ZDzhFm3+LX0Gud3IXDfoVfZZh4bbkYMRfCNPEhcmQU7QxIWQG8FIIQKQPUt2lfh0zyH99UcqIhhRnYamJRsBUJQJHU+XZOYbL6ETgmdiIaloMwQ1EyiMj7SWtKfNM6FkQl2fS9oxLFS/+kkLmm6LhrZ0vHS5of6r+8wTt0SYDxaDvjcmmmeVmjZth6CvgyL9z/qcGNdQbGlMxmw6HY4M9cAU5N+7+1USQPMfekgi7hiOpTh+Wn09T+gfAyFBnZkPNnK35tuS8u1f/l0fRSaxw66mH144mSUnMDnk0ztI+Spo8LSRXXUnHLHgaNXHHsB91Uh506mAQ7Wm/V+ncL8hFWNnqDnEa6IS9uKKCBI3d+wgMdj3UnZvyii0PqPhCvYz3LR0eNnDK5/qV0FR2bm6aitnzCaqb3HuuT2lyn67BIKdxYeboOJK2qW7/GLqH1lNcR1t0/94plIhoJbuW8aMREMGiG4IFRVN4RNKSWKrQSkYneOKTlmbmyqeRChqWVdIcSmdmIWcWduESsqE65wSiZVSvTFqlleaXtLBeYH9O6rV1/Wo4PCxQFiiPP+vTfugG5I8Y= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xH1+j0rN9H1EUusJPmMGrnF0bxLZj/e0qFAgbg9FfwQ+P4nV1ge7HZbwbCr2wyPIv8M9xYW9oLYKRyXFrOzetyDdlk/qWuLjqC0aq01vHWSmYovIhPJ51F2xLgP6rLOgbKOW7amFKAbpUdp0BffpVJCK/C1/BhQn99DVPk4lQp9EbsYMlJ9esT8+1tBuCWqYTihxjYUBKggMyYqVBxG6Tkl0r5I2yoQ4nS3+qL9kGFxolPZIcjNk4EGrakqG4Z+jhKTVEdSY1zNFDpCi4CDIDxjOZxQdhezJo9OEkxsaMdUfIw4qUY7HM3R2/QbcASXHaJiAQqypFbJ3Fzbr0HMJq698plqEML1RBbHKH6DNR9taqGTVc8srYH9yOPmAtk7Upa0avayd3g9sJ3X0p5lmiEcG6tz3I2kwTpWBQewcejNWwVGM4xsGAneMRK8LN4DS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EswJTbA2Kv90JGeVENYh0pJnUehlGb1D51+VurtieHR3nIIPjrXpHqLct7ciMU7H+fISeDSkbtNfa0VmMxqPccmLgCsjpD6gkD7YGMPqFHQ3BmRtURbAYx6nPR+MOrT2UCqu/hCB4vltKm45LahjLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98c2b03f-703f-409d-e3c8-08d9757db0ed 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:41:35.1498 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 14/39] avfilter/f_sendcmd: Deduplicate AVClasses 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: 74TpNwq2ikze Signed-off-by: Andreas Rheinhardt --- libavfilter/f_sendcmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 99d8ca939c..f71d211eb4 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -572,10 +572,9 @@ end: return AVERROR(ENOSYS); } -#if CONFIG_SENDCMD_FILTER +AVFILTER_DEFINE_CLASS_EXT(sendcmd, "(a)sendcmd", options); -#define sendcmd_options options -AVFILTER_DEFINE_CLASS(sendcmd); +#if CONFIG_SENDCMD_FILTER static const AVFilterPad sendcmd_inputs[] = { { @@ -607,9 +606,6 @@ const AVFilter ff_vf_sendcmd = { #if CONFIG_ASENDCMD_FILTER -#define asendcmd_options options -AVFILTER_DEFINE_CLASS(asendcmd); - static const AVFilterPad asendcmd_inputs[] = { { .name = "default", @@ -628,12 +624,12 @@ static const AVFilterPad asendcmd_outputs[] = { const AVFilter ff_af_asendcmd = { .name = "asendcmd", .description = NULL_IF_CONFIG_SMALL("Send commands to filters."), + .priv_class = &sendcmd_class, .init = init, .uninit = uninit, .priv_size = sizeof(SendCmdContext), FILTER_INPUTS(asendcmd_inputs), FILTER_OUTPUTS(asendcmd_outputs), - .priv_class = &asendcmd_class, }; #endif From patchwork Sat Sep 11 23:40:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757036iov; Sat, 11 Sep 2021 16:42:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC/4yZPSYU09TCwreVFGUCg9rY7apXCl7QRxEmPZNRvNGKlG+tjxBYi9SD6MUUtjUrUtkS X-Received: by 2002:aa7:d8c5:: with SMTP id k5mr5259692eds.194.1631403746944; Sat, 11 Sep 2021 16:42:26 -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 dj27si2860750edb.317.2021.09.11.16.42.26; Sat, 11 Sep 2021 16:42:26 -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=fu0BgnDX; 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 62DE968A8A5; Sun, 12 Sep 2021 02:41:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CB0068A8B1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TjGGP5BYgEAY4zS/HhWOWdRv84Ds8i6JFRAWLqWUci32uK4xmQA96XB4MeJwPSU17BhOYU8LgnttdVRD+frUJN6n46oCQZMnpaWyvF9WPi3CMFxtjdXrzOuRhZYU+vfm2RqEkB7k5az590P3ldB29Mo+MSmexkhJcDlEjJsIdxpJV1VNWDp5okHyEhrRwKotlUfgRJwnQ/xLVqfqd4AYUOC16nUqv2Gy0RKctezG7WSKu72rmRUaYeoGRVi/16vw0KGzcYeFBoLGud7IHbJBq1/DxrxzzduFAyeOmv7TbdLxDh8MATxOc2QWR++8US3tVOpXrY6jdM2H+w4qDFd15Q== 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=ibKKxDHBN5gLCG4gSWEZrUd8a/FsE2Bh2n6T6arCH3A=; b=WzWmHt10OrQFrXnH0JpHIghQwdolncZTv7vg7wGNOqmluuftwRPNohWV6y9BdZvrpLIS9TNCyo9KCZvWMT4s1UcGr16UQbqBzJKNqyfg885vOFXXvosp2B2tOfqqQaD4Q5nlqJM/9kyNGlpnjzQKAzLulvj10FQ/BSTPW88Hy+muHTQkXYZHgHRAyOBTDbz4hqcbKss4vSJxT50Z14gaIUbn2CEOC0Hymll4UBTN84KyDAhU7LP4X6OEMy+rjVw86O3yqeljAw1ILxr1bOiGDxjhWFoG88IlNkXps5QM+BPRo6uk4Kheuh8lwJiX25znh0vAnlQxTc8EXt445su+6A== 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=ibKKxDHBN5gLCG4gSWEZrUd8a/FsE2Bh2n6T6arCH3A=; b=fu0BgnDX9ZaPliGOmFvrYzzX9DK1zXlTTUVqpbxCTMB7+j0gqQ2KFnOzRw4q/KNrFlINVV8t/pw0nxjHxcQJioOQJfrrv3OczhXgVKvhc4ITAFM7cclycNvIwVx/CkqfsMpH2x60B9uh6f0lG44pfDIGjpIc9VwVXpeiM1jDeGogbZwuYemeMMSIP4eodEyunSGRlnlq0y6xpdEyMBmY3+FIPjjqZ5E37P3AT7qG9OYzk0ykkvWZZL9azXYQ9BTttTr6X1iHsXSBRarDPs591WJ1l2lJcqslAEYUF6IGVeS3KQK8nEAvgw/9h4wsrH0RFbo2kYVJstVmvAXSsGs4FQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41:35 +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:41:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yf/rO/mkIDwSuhsImcpLFiQsx4coXAOn] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ced296a0-f4e4-4d30-3110-08d9757db131 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK2WvWpU8a7bwaWAHGhJ/PKjovSh7sBO2LtYySVivddyN1tEaiT576LdTQwBXKZX+qkGZ4G7PfQwgpbgkaPPaWGPEnFeDL6H1NWaUy55Extf3V2/1nd8PuPXC7zY6+4mgm8TB4z/Y05vJizUotczgW9ThPOLnCgazfPY6QSveNMN3fgP1GcNMav0zPfVNQLil5kIrJhtjW7Vk0M9XBvxsDFoWI8EZIjLkCYhZ7wtGlx1E8wjl9Y8hzhPq1mQu42zDzEiOLG3iSnLO4+o2eZoR35EinywknRUhk76XOQK9UTS6W8BUCtcAzEpFbl7yK8rHZMG6qtMUl7oVPNkkU6BLYtUUdYjgptmBHIsUXe6Cr6zHhg8ngF/7MJpDR6avHWIvUjZnw7UtqJOvNcyRJJTJ2As4XXDEOb49K2By8bjqufoIzCB865L2yuiI0wONEcfeV53ZQ5+f+DXYENT/HW3sCRQiaYD+2lJZ5a1chbQyAQBz0Cv0aWDqU4cufegZl20P5fhNH4dsrtRqImK3sY/Nc2yeUwY38PS3h2Ah44jn1nzlUr1f0nlHU5AAd2ci2LIbw4Ulc8e+Mgta5/O5DWF4nv16J5QYOiaCXoKzXHYiJB55pwFy3ZB+HFRXfB1LfoQWEbfmX2nLKOMJd8yLoG0e33iwl/28NiC7+WAKCWDq4YVBv12LYOEOcw54LjPN+BcspwdiX+kl/CyA== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FujpdycFsDvkJpFwOQ/Nvg7V+pU9pNKXYQB2n5nmRtC3IruCk++m5xe+TOjC/Nuh4QzXSAGX2vKUOnO8I8y3h7sgxXexsRLPtL6vcmB/3LUTYR+zx+y7KvpjAku4L7BX9YMtDC+W/Te1RfioImJ0Xdp/DNmEoxu+HfX7Gl3ZfS1ILmOLvT00GsTsid9MXpvORBDmbRG0oJeWxC9IkcTNkG8JdXfO3fJUGGRrafhDXs2R0GmWIrUQ2x9B7l9nTOvhfuj/2xxzW+jWb9XOOS06bJBicMdzlmZXQzmfDKr1Qq9yMdbfixwM/5y0ObFQ8V04Xxh2WpVmITqobU1Xby+aks6rLe6BQlZS/KvEOQfU2j+IeTu1El5p67azOfERfoag52WOZfbCkCP8tXPo5nLhW5O66Duwh3EYBgkwuYeijkGg69sppmbbQiPAQYcLN1ri X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yQLBAXDps/AwNFqbTfcM8eUflvslkIgLbtpuYFUJqYhX/xU/65Nx+XXG6LSoG8WR9ewYuLBe5bD4h4GuYQ1fDvmseFcjJl1dmP1lb5yVL+l9+LyPDVuv0Vv4rME5iqp2TkAjP/rbLHkcH+CCBBdh/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ced296a0-f4e4-4d30-3110-08d9757db131 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:41:35.5949 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 15/39] avfilter/f_streamselect: Deduplicate AVClasses 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: UfoFcEumdzKG Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index c5427672e2..80a133fec3 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -48,7 +48,7 @@ static const AVOption streamselect_options[] = { { NULL } }; -AVFILTER_DEFINE_CLASS(streamselect); +AVFILTER_DEFINE_CLASS_EXT(streamselect, "(a)streamselect", streamselect_options); static int process_frame(FFFrameSync *fs) { @@ -327,18 +327,15 @@ const AVFilter ff_vf_streamselect = { .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; -#define astreamselect_options streamselect_options -AVFILTER_DEFINE_CLASS(astreamselect); - const AVFilter ff_af_astreamselect = { .name = "astreamselect", .description = NULL_IF_CONFIG_SMALL("Select audio streams"), + .priv_class = &streamselect_class, .init = init, .query_formats = query_formats, .process_command = process_command, .uninit = uninit, .activate = activate, .priv_size = sizeof(StreamSelectContext), - .priv_class = &astreamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; From patchwork Sat Sep 11 23:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30152 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757347iov; Sat, 11 Sep 2021 16:43:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzQj1GLCvdd077JtMk03ZFY/ZFhPO1yfnFvk7ZIS8JQGrcdS9NwgkSaY+46FevMku5Ycuj X-Received: by 2002:a05:6402:5163:: with SMTP id d3mr5445518ede.220.1631403785945; Sat, 11 Sep 2021 16:43:05 -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 la20si3914387ejc.3.2021.09.11.16.43.05; Sat, 11 Sep 2021 16:43:05 -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=LJLIFxu9; 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 3FDAD68A96A; Sun, 12 Sep 2021 02:41:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4367768A8C8 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8qrA4KZPJ1BORefys9PJWCiS4y1tV/OllUgCrg5NAXN6aPDqfqoNh04blVa2NK1hzPSyBrkgsUjL63o4lDD0yrsuw6wTskZEKNExbX2LULFngkm2YtIxD4GR77sSdHmBBad2RGpzvmPjRa3CNNSyaaZcUaK7o+faaSuPvKhVhc7PnHbiZ9uDKM3MV/QspBRoLbqX0bWPpn0gyYwjbBs+RcUrDZavxwCO6bYZiy1IMdlfEJHp/GF9VjBDt+qEaS6RKdHDFqH5az9Faq3Csolj97H17J1cJSL1Ka5QbBWkE+XG/qk9GY6J2vusV2LWdMJGd2l5qpZaGAjzannCok3DA== 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=nLXDmEteTtMWWVHAHRQ4dWqb71Vo0Ddyb4/Sl5scEMI=; b=WOY0dlpzchPIQq1X+1fBu8x+Q7D8fYGe/C/f6WBSMV9XeCgOTOVBLLJYBDe9UJ8nXgtFN55eXKN0S2TtCOGDON0QK1YWHdViv6dE88+yTerDlkw2KB6O9NOHw0LK+GQiSPWVBMcZUYmbp4M4iyifRf47ZJlrXFYYqG5xmlhyHU0OSaUN2msZgeOJwuB1fQdy1rMHBM5JJszKEl+fpzZEPtBtSv9Pi+F7LQCtLrH6F8Yn4nIuOltuEalFGBDtyigJLkkc9R0muDOCzHyTw0xBR9GQph4tVe64gG+09X27x2s7P1nzwdRkFv6tBQbVA30P/DQCJSClaToca07iY6Z+jg== 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=nLXDmEteTtMWWVHAHRQ4dWqb71Vo0Ddyb4/Sl5scEMI=; b=LJLIFxu94tHjl/W+6exaTz2TmqxtVXi498EwBWMhUASD/UVh28vubdTxJ94eHD8nQmFJtDCNAfkz/p7URseaT85QBk1P0sXU5p6CThWzPATaAkq+viUA/8fAcDv/VaYx4RBPto2eVFOGd4gzh7PLpE4bsPLEr8DsYq9g1IDktAkVQEUd6dK0g7qlITdBwpYfAB7PeTFFzI6WOIYVYLaZIloJLVoeEmEzOfQVT96EgYLr0sqYRJps9Xb89hiK6sjhkrv/hcCaIKL52/IyasY17dWpge5InFDRE5i6qkjWTR0xyp/Q4pHbyhvIJ3+kqzpuXRo/VT5CkFmQblGQGnXVGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41:36 +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:41:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2+6VxdELPlO3WN3+QsM32P0n1Wj9X3OO] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) 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:41:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96846b37-6bfd-4554-f982-08d9757db172 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK2WvWpU8a7bwaWAHGhJ/PKl9Wts0dOnUP4HG0csazhxOVVPa3kLGu/Ee0BE/CbIjooNh+KN66WPNl4j+B7o3WZpUui4KHOHhKrk5aMXwFNAjhipxIgyzlTkPptMpF8iTDQQagFrkfS5F7Dr9srmUjCDOlG7vq3F7ojWqMbLYkDBwhYHN46vNofXBIS6XemxnrIuQOAfjkLSkuFKIYxOL6rRb6fnph/lgfU46Iz3LxzYl95APsI/LU7ZNgF1dHW2M4E1NCPw77OKODm7qH2oKUdMKIC3OPIaWHql4Ruym3FWAAgw1fNosGCYLVkPa4zIAxbmd5fFhenbjNh+iRNyUVvR7h86IPK1ODjoWxadHSObRK4O1iKa1D3uQHsRjDcSDgoa3QvjQRzrcOvTZp0yTYMRK3Ub8uZefLJ0aIXI2PkUFfuzLUwbLwHQ76/bOYtGCBH3xFrUa8b7GmV/Q3wzqOYXiUw9r934VTUeBNFSksC37IKRBUishfkfVkgbdH+oE1Y1se+6etMZK4FOsiZE0qIvPSkJdGPD3HBc0XOcpPlHbmMcGrij77aG+mk5Q3ZucKzs+zinlSmN0RH1rMf10peSXZCNyLvFPXGYivWjtMZz+/W/pU23AHPyD/He5BnIp5s35pZfDaXid/mJWewmwmZhmA3P5P69C4Ef9JlXqe9+hD8S/VRIkPurTbYBBmqMqnwXKn6d5CDOg== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R0XEFNdZVjmhnFr+VxYlP1KTclgPtoOQFpM3UZ5WGR4455YNVrxBWUcsnTkIUKVuxOy6EzvDGB7O2fPXD2Gj1O4h3Z8mNc20FA7e047N73dBvvaOWRFW+TlpUkwzcIYaWx31xxAntK4ieIbM3j0Bm63r/qKDKlX0ci7YEzDUu+rR7sGy3Upqzm3/WiPwkmPSXHAs3mEyMWBXvj7ldnibztjk9hgTA3/XAwfIvMLCg5bNMNGoWUzDuWFeorzGS+NE6xoCFz89J/CULgDx3mcwlwBbuPZtYX/YxRLEs03e1eH+Mz2ZYhSNluLjZgGuOsiCj8ZrrYBuroKdQvm18Mz8+7jODaanO5ChRWWNlY1eAX4RmNPYnKRM+qYxuo9Oxh9fhQAABP2AiOocRZUhpHeBcdIqLz/PPKdnsBXrINqM+F+y6cIOiBTcFsJ2IwJSYoiJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zs+9JkVN6h/YsdivBvsqVnBXy9zJcwIihpYEHS4KXY9f4TYRKgT3lFXFBD8XBUtr389bqDCe951NlPiqHx+0MKS7FahPvdfzNso8s1wklnsVPNuA8b/HK9bhCifC9ALvU/N/faDrzmFU8Gt4eDkUow== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96846b37-6bfd-4554-f982-08d9757db172 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:41:36.0001 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 16/39] avfilter/f_zmq: Deduplicate AVClasses 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: FhNvrqUV+q6W Signed-off-by: Andreas Rheinhardt --- libavfilter/f_zmq.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_zmq.c b/libavfilter/f_zmq.c index 5de22e2fbe..3bd195f0b2 100644 --- a/libavfilter/f_zmq.c +++ b/libavfilter/f_zmq.c @@ -203,10 +203,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *ref) return ff_filter_frame(ctx->outputs[0], ref); } -#if CONFIG_ZMQ_FILTER +AVFILTER_DEFINE_CLASS_EXT(zmq, "(a)zmq", options); -#define zmq_options options -AVFILTER_DEFINE_CLASS(zmq); +#if CONFIG_ZMQ_FILTER static const AVFilterPad zmq_inputs[] = { { @@ -238,9 +237,6 @@ const AVFilter ff_vf_zmq = { #if CONFIG_AZMQ_FILTER -#define azmq_options options -AVFILTER_DEFINE_CLASS(azmq); - static const AVFilterPad azmq_inputs[] = { { .name = "default", @@ -259,12 +255,12 @@ static const AVFilterPad azmq_outputs[] = { const AVFilter ff_af_azmq = { .name = "azmq", .description = NULL_IF_CONFIG_SMALL("Receive commands through ZMQ and broker them to filters."), + .priv_class = &zmq_class, .init = init, .uninit = uninit, .priv_size = sizeof(ZMQContext), FILTER_INPUTS(azmq_inputs), FILTER_OUTPUTS(azmq_outputs), - .priv_class = &azmq_class, }; #endif From patchwork Sat Sep 11 23:42:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757742iov; Sat, 11 Sep 2021 16:43:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmeByLzJ83yOzGlshy7cwelihHQdWXApTEBS445N/RhEX8ZgulGda9DbMaZWx6kBRK6Sp0 X-Received: by 2002:a17:906:1341:: with SMTP id x1mr4688686ejb.277.1631403830730; Sat, 11 Sep 2021 16:43:50 -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 i7si2743299eds.165.2021.09.11.16.43.50; Sat, 11 Sep 2021 16:43:50 -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=Xi5B0nrC; 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 62EEA68A8C7; Sun, 12 Sep 2021 02:43:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBD7568A8A3 for ; Sun, 12 Sep 2021 02:42:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KBvPt3YFr2xHYYsH4KfUJhuwS2D+YyUia43RyNQRUvSoRSR8igqF6kF+CxXcPVTtbzmXqDckNR1YTZzl5D3UB9MzjAzxvxlBRlLNUXIvmADPMVXhknicli0J/xVdoMWyOL16QSb3/HWdIUvCMc5MmtwFnXUrRyjR79TLIzFsnJiQs3SnZeJiSla/fZf2on2LpnsXxw7KephgAzUBwo2Qvw7517lvs59ZSPYrbpq10LtHiPR15cYtrcp//fa5s5JoJo8jbT8/flavEegBuIB0h2fjjC3XZGAVJd6dI/2RDv+KQg1NluGQFaQ/i+cfHHve4/G7siAFdj1lxXZ5ZKuiGw== 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=us2h+H9Mc9gI/hisfM2Qx6MpNXsy24OGjmbFPX/Jwww=; b=UpAn3KFLFKOzm4IpGpoYZihKAwHwwlYkTuoEIA+bHgNpmVIjT3On+atZCByLIrbNTPii+2/dsFp+V7ZnQhWRNtZ5UFYRH25nlSMM05u/wX79iEo7Fwa83v6MtizDvFXiqQh6qMsGgn1hfkJbTF+om77rksEB44hwEynFk+c8diwfFr6r141v2KL+WU3cOr1CRAI6nRn6k1Gd95jLfQwxxtNtrMJCZ8PFGy1xpG/csjnG+B+ju84c56RbNyxnWRbndoJ3H82Y9HH3cUnpLgY554jRPusPpIMtw7LeCceHKNNJV2gBfKQyRvrJRjELrydDfiwcgLMzLgyFpAGXxTX0iQ== 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=us2h+H9Mc9gI/hisfM2Qx6MpNXsy24OGjmbFPX/Jwww=; b=Xi5B0nrCNlJ1C+dHtTTxBRrVrWcVpBuZqRcFPMhpsU9k2ag49JAB1YcSu5x7LylX5Wn49brEVgc3aL9pHEYnIUp0TFZiISCpvosAF1/Xgcn74diYLUKTICCB7xEJ9xSTET6nWRQpwQ+LRu4ozGt4WD9o2rS2dABopXcuf6b9yXLOKfKNW4ep5F2aA45QhGco5LoI/GrtvTj0q93mUndbV+3cQZyVXbT8Cpi+E5R5wNXvYq2U6BzzF9m+CqQ3jZScYW4MyvjUVeAvi0Kf3HQC98X4bgIDuwLIAZhzpOWg++e/hQpvDrAyaOio8GUrFu9OqVKnqzs7EjJguuwZccJ11g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:42:57 +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:42:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [OPHYwCRNX4gcKu/VLaS8Voe50yQZqCWV] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:42:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c1ece24-b608-48ed-beca-08d9757de1b6 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UFAju/N0FeFgknNl9FmpqXWZvrbh57cNu+CbeocV+fwduHdOZiBz5Oq8IHzarge+WN1LavdsRpNi/irwf1HCgbDvx4TPyuo+nKTPjjKgPtgpf7o2PdBzscv/m7THuNnXOrp61OpHLQPEN6/NONmoq4YFIzIQEEEnYkFm3QIGZnAP7nU2TmU7VYFDh6akcI0P3nNJux41MevwzPbomxWIUUn8pP3P8adLRHWTGWstu6c94mHuwykgN6Yvck2eYkUhGHUn+6oJXfR0NdAVp9h8hYoO9K9htjI6ZynRPtM9oi1NlQk+bLlVZo2zBH/MVt65ohvjqt0H78kXCizIya4fvXIQCsdmvWgfVQZf4+OD7yUJmGNmSPKvHLfDTJgL8tH2x24am/UkadABXxmkdv3kkR1Cnwr+YMfXmcSx7Tb1YU3NPKEdE7xRDWhkTyYqOZmttwELe2Xpu7nyiNYGwB3mKQBu7Lk7g13fspy/tLFykjUkau9+VDV92ATuxpPU6CrFsi3h/Ged6+8FWN4XCZZJx6VBWr5YWCoTJNwOa9Zclyksx0RbU7WymY/cl0AX/LjhPvd94030zAym/tF2MtDeiFc+6EiJt0lETpNJYaPItGZssO90LNxlo1LitwiefIkyDg/Xzn/5Sy8IQfkPqtyKleQxs+egOBJnds3TNfBUHSCiyV6kj7tU6a0Jmfmy7sfBdsP7w03yTCnMRbZ2PHVKkwkPdWlwXLzyk= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJGu926gIaJsszopnP/Hxs0S4z0xyLCtngo9LD9EKJLdkxoPrKKQ4w3z7m8vUI3jxg63yivwMwdd/8BzknKvL6oqfT1N0q/N5RjBz0IATzzvVDhFigYSlALukuO+3dmbF141XRS+jnQT8l1TGa0aqf9GATxaiLnHXDTr6TmwbUFRrZlhOcyHEGzjFhY2cTZg0+4flDmWasOX7res06X6lQG1Wj6sQFNSa5yIZ5U+tFRFMpvG1XSU2iyTNGzLx/zHJAEe5onG/4ztxX3/xk8gPqv7MFPZMOgON09eV5R2G9I+V18CNCRv/uO5cCNju/JcjQZuqWU4FQEyIaLFYNnta9BbEiKnZCe1ogSy2YKWfbXA6hvlK/aYw1/3/V6xjlOxNIlxuh9lCDCp4FVQ/XPrCvHk7EbL8znOimNXDqCgfXvT4kz6vE2X/PQvsujFXn66 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GyKbCWkmaIHU3xQffZ62GF7STvOvMAqH4xDqQpYEN8qfCEEZfO8oNmHEMfffnwtL+QLfO/C3++2jMdrppsAqnO+3da3U3USsLmCcEeR5RXl4UKuSJCDxXCiF6e8sb8RJ5Z5gVxFZkAW7QYSGAWqDJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c1ece24-b608-48ed-beca-08d9757de1b6 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:42:56.9888 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 17/38] avfilter/src_movie: Deduplicate AVClasses 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: 8sGkhfBLB87D Signed-off-by: Andreas Rheinhardt --- libavfilter/src_movie.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 0d63c1e4bc..27b17c6a9d 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -630,9 +630,9 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return ret; } -#if CONFIG_MOVIE_FILTER +AVFILTER_DEFINE_CLASS_EXT(movie, "(a)movie", movie_options); -AVFILTER_DEFINE_CLASS(movie); +#if CONFIG_MOVIE_FILTER const AVFilter ff_avsrc_movie = { .name = "movie", @@ -653,12 +653,10 @@ const AVFilter ff_avsrc_movie = { #if CONFIG_AMOVIE_FILTER -#define amovie_options movie_options -AVFILTER_DEFINE_CLASS(amovie); - const AVFilter ff_avsrc_amovie = { .name = "amovie", .description = NULL_IF_CONFIG_SMALL("Read audio from a movie source."), + .priv_class = &movie_class, .priv_size = sizeof(MovieContext), .init = movie_common_init, .uninit = movie_uninit, @@ -666,7 +664,6 @@ const AVFilter ff_avsrc_amovie = { .inputs = NULL, .outputs = NULL, - .priv_class = &amovie_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, .process_command = process_command, }; From patchwork Sat Sep 11 23:42:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757808iov; Sat, 11 Sep 2021 16:43:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEU130jmpp4+Kl7XkjBiPwlB27raIK5epECV0UUAcdPJZkM1IrzJb3k6stnwfkreaSEqQ9 X-Received: by 2002:a17:906:ccca:: with SMTP id ot10mr4788526ejb.429.1631403839501; Sat, 11 Sep 2021 16:43:59 -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 n10si3716012edx.387.2021.09.11.16.43.59; Sat, 11 Sep 2021 16:43:59 -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=lPEsCceJ; 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 654FB68A9C8; Sun, 12 Sep 2021 02:43:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DE5668A8C7 for ; Sun, 12 Sep 2021 02:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U7muhZNz3yE3KgZ7bYXCseWqzmYx+d3hWByI0X1GCk5/kfVEJsE8L6llPQDqvjgQXgcWhtHr9L8ZWDY5MacmVXNp+AaoNXa1PQF116uZSoMfSWSbFf0ZzEoyo84nozj5uduMIiim8vaHZ+jke7V85vvrLW0DSVQyOxYR2HQNwN8PvIMm9KbyB+wOpI9buZPR92Fv8cyToH/lxwsknmtpuNVa5FP3O3P75aL0PHxLrP1bNrT4wUr35uYNJPDy13evK6SMToAbKtMe25npcZY1yPTY/0bCZfCzw841b2VINjhql5YP9PJjut629saFJvNCOf8WUiySe4sSRuhgq7logw== 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=sUAhvUe1nqWm1wL6sm/QPSb98+iYRN4JomZfmGcKXPM=; b=ZQRlN9JycXRiD07bGao9pzzygQeMAeMZpvZ5HWasANsUNmVlV3w00smPLNgimgl7kiDe0ZBUEeFAp5Psn/UoehQKqfF7tRsS4lkTxjcxWhy/DfG8td1rGCjwDt9nNyWY7aD4JQ13N7TcenHtHJcZPovS7QhPlSA5CDO1PEm3QPB6kPvf7YlLIuOTU06SogZ/sKbEVM8Cp2D1yF6YapeJ5/nvKI+Wep4s94XQ5X5yG4yJl1oQmDUbvi0MJmc6v5R428N4QkRNj80G5npSTyMjOwWd1ord5an7FLYa01hc6TTa9SmNmQo2crXy/GBAiRP8Rvxyhhu1K9b481N7Vph4zg== 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=sUAhvUe1nqWm1wL6sm/QPSb98+iYRN4JomZfmGcKXPM=; b=lPEsCceJG5c05DiOvq1DTHeQx133mg6yyGmbyORdxi661UOJsvp6mnmRw1h0Uadfwj2DyBaSb3rEU2zTVnVZwCQsqdQ5xLo7glnKETCeYtTvq1AW/8QY6zm4S3ouQcty+Zqpzs+dnVXh292QSbyWzsLOCw+HurG64YsIYrXalyKcI5IdfGExiBnlMIuuh3oXJLxFrVYYF4Uk45mOYGdBd3iPMg+oi4CIVAdlzcOHpvC7Xp0+bmfUAKBQryson4m13hDFtriEaE3SnEWtQ9AszjkF6FGpHSKc81ecD6hBsTihFQH3JYrMXMam+FC64e6WKmUH4akNpa0lhj4INEpTjA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:42:59 +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:42:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/OE4nJlqFanevdeUNdUnhzrWKA5UQt0v] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:42:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 755ca485-e84e-4cc8-c655-08d9757de357 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleFbGlJMRBOGfghekMmBOD38IsD62Eb52e5gTPfEYO6s7Hmx4nEE8d9MICZkO3Lu3niASThxs5vtsj0/iflNXvmp2KDwuuU7HKyN5HGnI8awWFsIBJ2Jh4+5A5bXxgBX7gMRPzPoBPBEYdBvXAcLNhvrN2huumj7wXCzvWxHkKSgTy92bulvaW3PodJtyyrtuQ2AMalxlDJ6n1k6wp+rgQWQpStdGwxsdB4Tr5L1mOwsJ8MOSQ6SIzq7Zbic3sZQm1HyK+6oMF6gC57nvxVNsMBZS8F+vlhEo7xtXf8kRkXXD1x9mUKR2+XCaamvwpvAnyf3cPw/hwNpG37LPHKzI6OdggJLIV1Yv7XzfIifLleZm1W6apKY8c4AYOLGHk0sXvO9YUSAbA1Z9W1zFlemo2TAXIrfAUUF6ONPUywXvB2CRsmuCbjDskC/eeRYuqHaH6v0+rdiov7cSx6pUT7jJJNQGo+eeeLHhstWraRFuE5dF44hQHoLJAiLFG2ZoA9WXRFKU5XPCDD7ZY9IeIV43tB1RjfC9yJlYEk3AovpZOfy3myo4eI7KxN5zWQAaF9UTr8nzmfzSeOGlQJHky6ObDOlEzN513FI0W5wf7R9FKQ48H52adFTGnK1XTudhvWM7EzCdVulBHf6+qoS+hKiA+SPYCGUKZL7hvqPNyNwPAirZ82H7ARnEK5uk5ueA7r5oskutBzuWcw17t97xXgzfjSen3mlAhNVSd3smIkk8Ekc8= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8uoqK9ekVfCYkxp527g5UH8bQA3KCMQO0QGB4j6xWjwS3R+BJcSxsG/uDb8HgLU+vpLURMo/vJMUwUG8HOSypjQ5WliSG3TcHdhs/9RCkOxrNx2/MF/rRb3HY12vh907lqSV4OR8oxR1/JSckO9nwNHr2dnVFYIIO9ufjNhjrInbYBGqEzf40877NUqIF/GqaaYDIQ2d2zMX22f8gL0UXHJ2BPUR4hSgbryj6ZcYWcWygGFKaqyZ8d+m8hYSYK1WcQEKRah7VXoLI7wK2NWYFZwKqR5Rciwd8InItI9UWjz4JHxkqxWNZirjBnxtR/VbD5W8cw1BTl6a3PtOc++HXaq0F8VpBpTZZ2FtX6EXkV1EUdQoFhQkyRNAqPYjgNpfB6Sy0C13l2ADPhqNlm8ylKz9IXYA/kzCP+zIt1O+3nS9N+FyuRFM0lhPLSju+t9f X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sRNQHnm1dsJtMGYtRADh0mPHZ9rU96lqNYICpp9SScPiYrvWKLl4GmRcX9kdkwbwyzMiJZ5dnZJ0vPAYTH+OCrUZW2UGCB6RG+RFZfSWuS5cs+jE9KNFz4UprGjKezt8ZOLDNTGE1foXb2jYO4PTHw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 755ca485-e84e-4cc8-c655-08d9757de357 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:42:59.7268 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 18/38] avfilter/vf_blend: Don't redefine options name 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: fWcfMsel5Kl4 Use AVFILTER_DEFINE_CLASS_EXT instead. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blend.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 84f1e9f5bb..73fdea3c79 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -943,8 +943,7 @@ static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame) return 0; } -#define tblend_options blend_options -AVFILTER_DEFINE_CLASS(tblend); +AVFILTER_DEFINE_CLASS_EXT(tblend, "tblend", blend_options); static const AVFilterPad tblend_inputs[] = { { From patchwork Sat Sep 11 23:42:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30194 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:dc8a:0:0:0:0:0 with SMTP id y132csp2721513ybe; Sat, 11 Sep 2021 16:44:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEVyoO9XSt6zyx9hIMxT1U7TT/V5OyaE5w9GqKERKS48nkNgvD/3nIhr7OagjV6yyGalCz X-Received: by 2002:a17:906:fb13:: with SMTP id lz19mr4855823ejb.516.1631403849012; Sat, 11 Sep 2021 16:44:09 -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 cx20si3069832edb.163.2021.09.11.16.44.08; Sat, 11 Sep 2021 16:44:09 -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=HCVE+FYp; 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 B59B268A9DA; Sun, 12 Sep 2021 02:43:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9506168A8A3 for ; Sun, 12 Sep 2021 02:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eczvgv6Hdb5yaGt/0E+5FCE7wZNbkHSi47prnulBsi10J6b/ICIyqPwO02SuNcFiTmM7676ZKPU3+gvGQrI6msW/f+pt8R45qzRMC74PK8cdTptJdcL6WzU//aXXQDa4H2bgCdyTOtOi7WLww8+JtxYmsu689x6rUrS7nLnkZe+D5eLYCgC4SbJYw8JBi6u/HBusrCAzqSHs8AA3EZfp2uRU9OkudQHniaKdX9QL46fXJR1qyG3U3zK3boo1N3p5T/23A74JoK39rJlLd+NRAGRuOZR4gyAuRXHB/PCfjIAKvMs1kF5ZBDutc46IyKsWhinaTQX8o9iGV/83oLp7YA== 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=8cvQx/meb+742PHxnEJ9m9SecQkPwGNEMstbOFMXBOI=; b=ZpirLjjQE2WkqwWscbE0ltcgbNot/7YtH4Rvf3u6bxkGTCRG1R8wB0uZbq+pC9G1Amco1tOTnoOCcMvSlzj6xsu00HZhFm3tXaUPVGUZSw9mosMDHS29axUAipiQjQFQyHKvafZAuwAhftETmn565o3wnC3VTx3DaFB5c0mjw6VTukGCeKLhiwWj+U2LlBqbz3n4A+R6E2SdU94KlLd7lqX/+XcTeJrk+TObVDr7WGNP+uvxPtlkMmYeYqicM9mSFfWCpX9UAb5ZfQ8iLm2TAGSbotmj6Z6q+cpHDzbDwBqKqaZiZbMTmU/7t7MvPF+NWhVY/OQ4bENTDjhMUltS4w== 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=8cvQx/meb+742PHxnEJ9m9SecQkPwGNEMstbOFMXBOI=; b=HCVE+FYpuRqWBPRIkVIEL1qbCmcA/29nTjZjkxxvPGbAn/YvDauoHRALj511I1Mc+Pyx4z9q2fomeHBe2UMU4kNx/S6rIz4M4o0O7uSJ9TZJg+FptMzlDpgs9vHA7NPdC4P92gVZiDCkYou76MvQ1ONarIJ76Sc281FGR9kiTAcPoT+iKuqmMZpwYci80LuUFvttBQt5c4zyqX2r9GBy9bL5RprzAL76BA3Se03t7X4DUBSDIwDz296IurGMKRnX56ZkWTI7GaYZsIHIyzJMM3WT52llQSgyT5R3BAQYlXklvkf1x5EDtOCLhSFkN1831TJlS4zWvt8BI9FTq8MMfQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:43:02 +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:43:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pCLDLKlas0+Sesk26XR5p61UFINRFFPs] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:43:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 705adf57-6092-4ce5-7d20-08d9757de4b0 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK2WvWpU8a7bwaWAHGhJ/PKUkpgh/HvA3nvY8oIMeTaAF2gtIHpVe4n3wqL20aGVpWfz8saWbBPUoAnzENokReGyevP6mxERCP3fJOG46QllUm7QMBqmiL2Mmb6dY2/iEsY+JKJtuu/BVx0NG4tU8fD8b3VY1qjNw6KeCl3YEEpVb3gi8mork57VFzK0ZXRjdvXHKoJijtKp65EONbdbw3LQhnxBCeXjSEoK8U6/XJZgCDCjTjftFV1btfdJJgLhA7Kt6ZVC/njz8p7KvqK8jsfQTDCV26sBN2BHdYCZ/QwELBgkZSknDh4uKejcAvmZgIScS4Td4no3a+R4Bq3O73XeBu5XL69iYCB5pQpe7kshqN8eif09DIwakITHca0HVrkLKuAKxaWU63OKf8kBZ2cXbu8w/Ivn0VLABPAZAHbVmpjpK33SVUSI/twFaToHmdEQxhn2e6YTU1UZYxOeQe6Ar/J3P7QMaZSGuQfHo4wQ+K3628MiLj59QGn117FyiBze4ABnv4o0mwj5iX6fxjDV7y83afxLEa0PvJCnMZnLuTTb4SSsfS/V8M3vAclsllnhNIJ3A0/l5M2j3lmY63e2adPk8HpwcXDFoSplrJhfb6TX/u4QsCnb0pb6xVG2evs1n+cWU0tr6T6I3z8/vHCyqKktizXt7BJjIeLR7T9+ylF5xq+yHSrGG32ycGuJiTj8J85b5QE2A== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YQxiX6alNYfHDRbFmTrGz3156SBUCKd7uFFKhGjEUeIq1JhE/r+WfRiNvHEoAHHe6ZRRdaLcxqQp0XfxaGMEFWNJ8fRzJaq7u+wvq8q9NQH2+/NrMyGDDiTzSIYBdk6Wwd2y3fcjD3ITz4QODvhJGUhN0gteDmNlxiSSPdiyVRviLqYYnygk0X705zw8SEmxqio6YRTyo5uhWpxoIhmrPngfXXx7TV0lcCaHDYd7V0adVETJ2yv6qIgKPIZU/JiUCZSR9lH5v9LvPuyXUDq3gEukWQkor9ZrL+aWTnqI1QgEc98ICKt/STKsxAU6Mva889yFWkq39mu0c27DsCac8Yphau8NIIh97fQO+39Mi/CeqlyrPfpGC6nS21uFUZ6SxQxhc+DVyKV+Ok3nqDngXpOmwFKH3lGjiAm/3hKX6rf9ElE3cKbZv+7COTCb7S+N X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8+V1IrOxOLzYBzNY2ZhepM44bR4s8mCN84+ywQ/GzPmVVDSihLcZt8IZLLOdC3M1EO/H75KW5xgfxke5Bu9XroaJAWZhpua/N+ej99/5mz6X8fJg0msBrB0sKsygQSc6FrfO0B7klD7BAD1Dvwv8bw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 705adf57-6092-4ce5-7d20-08d9757de4b0 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:43:01.9790 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 19/38] avfilter/vf_format: Deduplicate AVClasses 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: FkPtzIRSBNsI Content-Length: 1836 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_format.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index b34675b8e0..0a5c739db6 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -140,10 +140,9 @@ static const AVOption options[] = { { NULL } }; -#if CONFIG_FORMAT_FILTER +AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options); -#define format_options options -AVFILTER_DEFINE_CLASS(format); +#if CONFIG_FORMAT_FILTER static const AVFilterPad avfilter_vf_format_inputs[] = { { @@ -179,9 +178,6 @@ const AVFilter ff_vf_format = { #if CONFIG_NOFORMAT_FILTER -#define noformat_options options -AVFILTER_DEFINE_CLASS(noformat); - static const AVFilterPad avfilter_vf_noformat_inputs[] = { { .name = "default", @@ -200,6 +196,7 @@ static const AVFilterPad avfilter_vf_noformat_outputs[] = { const AVFilter ff_vf_noformat = { .name = "noformat", .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."), + .priv_class = &format_class, .init = init, .uninit = uninit, @@ -207,7 +204,6 @@ const AVFilter ff_vf_noformat = { .query_formats = query_formats, .priv_size = sizeof(FormatContext), - .priv_class = &noformat_class, FILTER_INPUTS(avfilter_vf_noformat_inputs), FILTER_OUTPUTS(avfilter_vf_noformat_outputs), From patchwork Sat Sep 11 23:42:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30192 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:dc8a:0:0:0:0:0 with SMTP id y132csp2721577ybe; Sat, 11 Sep 2021 16:44:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzn6zT/aevOPf7kJB+eXf7s/BpOzZerokJbraiYWKUI5EPXCg6NUGbJFGk8l8PmkfzWoeyj X-Received: by 2002:aa7:c64c:: with SMTP id z12mr5303444edr.228.1631403854459; Sat, 11 Sep 2021 16:44:14 -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 2si2871390ejh.749.2021.09.11.16.44.14; Sat, 11 Sep 2021 16:44:14 -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=EJfEW2n7; 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 4320568A9ED; Sun, 12 Sep 2021 02:43:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068087.outbound.protection.outlook.com [40.92.68.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCA7768A8B9 for ; Sun, 12 Sep 2021 02:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cq4OBGbOdFurBX8xjwwXLWv2iabp7t7WLoeRvrmOWzJbP+aSW3q0V3oNc3RxZeDB7sr18Co0zXgKetxrryIY+AXftRqIm9T7gZwbm3NZH46seHqsAPUhxpnxOWftPdUADRiZD2YkPEDB7afPOPqwD3TgQvbLzC1leSTR7naL46a4HNQPnEJCr64OutprKtZZrez99YxV8A4HTRq13ld4qAzewC72yAHagPuhI2CD29KeCmAJDwwf56SQC8aGloG8NunxSJDdLnZwv5f6gNxIvkSHtG5O+fEyudsslJd2G3NCOKaMxSxkGlIMUqpDb0+N72QMu59vSXlum4Mc5yqxcw== 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=c90dp1h1ftfrKsAwm+lbarCUJjqlioqBwe0SdKcHEDM=; b=itiBNnJwAJ+WGTzF+c+ArVIh0Hl7ZBjYGlTnbJ4ckx4cvT5gM/uLpM2PtnDUv0It8ddjWEbE+bYLN4kzLAvwoFM8uTFeDQWtRTXaWXZjP4ENrh3F2RIil1KNxQ/qLAna9HI24ez3NpHnh+u8Txf2lTz+b55waZIqeQGtG0lDS0GI2lu1ZbCFBdRyyV1PhKsLzxqsCDiBeFC402UmNk30q7KquHr3dQd5AnE958UCbP4gg2RTmSL6MQH5ORhn8s2JZR3/PY1ZLB6V83hzwLtwaiU9LtuqqErOHSxT+hoJM7P/qGUNIFP7mubJyqoXmpDAH1lmO+ADJEBZj7C384nhBA== 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=c90dp1h1ftfrKsAwm+lbarCUJjqlioqBwe0SdKcHEDM=; b=EJfEW2n7cFJTL9wZ7vJq/FU2YgOomFe7lrZkIBCP0nnt4kczgynTyhz+v+lok8xxU/8t5pHHGBJwjOtdVu+HPSe7B8SrlAMXtuS0ftsba17w5fWaRIwr2VgcqJeqjQIaLHzJqMJWIkqFPOWbDWFBArkOkKwKs95ubZXdg13S0V2i2xgVwR1oTfL2QDXAPA0pR/n3Qs6xkP2+Qkqa9A2pJiTFUkEdOVgCAvXIsX8YBjrO8/qY1HQEQN4nMXik8Hlv4qVgS/rqQazdpnlHU1C2jo/AG1lJVIj4b8xlFK3+9oriwzH/Jn0o7C2c36dg43ffofs5NDkLlvKs3ToJBid4RQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:43:04 +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:43:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [IM4klK1E06WvqYx+pAcZrqcd5GjYheCm] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:43:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efc0e1f1-89db-4cb8-6317-08d9757de5e8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMUUNkrzYmJisnEY6r473l5njnrfPudQx4mVZdpI0YI4sKweTqyIANQyvtf76OLqzKpsoC/6EKmHc+T0BlWlaZi5gcr36cZleP0KRmvaUA+y20X981sQTbamTRHvGRB695oE4wPO8p8aENVIGfeyEkrYmeq8SpRUJewndzLBYfEIJqHiS/CAunMf8gd+Yc6lQ0GxICr2NSaGJOtU9VWQsqTC6RubH0hdwPOtTX2gagbn38pM9QBW/aVm5SFi0Ol0MVmWsJ8KubTlak3vQcNQzABCukPSvXeNC20LJnLkrd5xebJkrQDeKzJJ0vBB7wBpgGgKevjiSfeZ0QH0fCT4lLHRDkaLDJGcNoq6M8X6cqU0k4bjC7FPFOpOfjD/L7aiC0+zYAK2ZPJAStNaV9IgTT8R/AKfYPhhfitunmtfOLlA7lXauFqOfZpdcEHPgFCmEkEzUKlvIR5niG2wFjsgN0OkjGVdrw2PLz4ryv3DRr3fqzlsst/KugHNhYyN6oqB7ifVa26jPjTXzI4SbLG93IwhgHrJk2dxX6tAIGFGkqtKGN6W8gO6SbRECOOgNaxxE/YYpN7DJfxa9JgdGvu413GKPzZUBKed9IjLUl5r0DRHq7peK1xuTkAEYlGYx6t1siXuuY4BdK3BARKNU+gj7LgMijZ+3NskvQpxUFpwLQNUYdQks+UVUYZRnbGV90nJJhaqn85hWMmTY= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2vaiEsEQRJJldg7nj6MAjX9dSejfcwfogqRX4cKor4M5JwUZFtw8Y+9+9dyUkGztCxIMOqtlBx9KpIznQhTK9HjvSGv0NaF/e7K+7pDR70d/MPMhiC5PDR6f6R8TLeoKRcdF+02oVv4xOehe3C+GTKDhQLIwAAsUBvnCpIRZ1PYLKfUrds30l6umxFyD+FLFIHBv9cY4Wg/aShXMcSXe94x+S4FQIpv94NmIMPdQbnumWQjEoHob6g0S4PNsOzrX9hN5xOZ4pPwIJV4A64Ry+fkft4G45Zy6zRsoimtq7AlRQYojtKr8iWslHb0xa5rptXSB8KQRFAwWCEXo4Q2VE0MEo7x7ROIho0iFG40o5WRk5JhzBdgNpNKnW3OMhBD8Ul8UJ/3qDaqPwHMIXIIC/ltrraGlnZ6GsuWhrIdhwn9QWtQvG/GU0PYXglLDCH7J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RXD0VU1Fzvw/wDSFCz7OZIGbNWMy9hPycMzDtIPvs8ptZYnTiUhqAJWOpamdTqyNwhVDIJDeTxbT9dNh34tvHiu+FYIdILxGMG18U10bwC2RYtqEKYa+eEMLTj9c4aKcp2HsP6wz3fSzXHkk8gbkMQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: efc0e1f1-89db-4cb8-6317-08d9757de5e8 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:43:04.0091 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 20/38] avfilter/vf_lut: Deduplicate AVClasses 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: agsWSI6NAtcm Content-Length: 3294 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lut.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 812a5c1ee1..bc9af9f609 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -587,12 +587,12 @@ static const AVFilterPad outputs[] = { }, }; -#define DEFINE_LUT_FILTER(name_, description_) \ +#define DEFINE_LUT_FILTER(name_, description_, priv_class_) \ const AVFilter ff_vf_##name_ = { \ .name = #name_, \ .description = NULL_IF_CONFIG_SMALL(description_), \ + .priv_class = &priv_class_ ## _class, \ .priv_size = sizeof(LutContext), \ - .priv_class = &name_ ## _class, \ .init = name_##_init, \ .uninit = uninit, \ .query_formats = query_formats, \ @@ -603,24 +603,21 @@ static const AVFilterPad outputs[] = { .process_command = process_command, \ } -#if CONFIG_LUT_FILTER +AVFILTER_DEFINE_CLASS_EXT(lut, "lut/lutyuv/lutrgb", options); -#define lut_options options -AVFILTER_DEFINE_CLASS(lut); +#if CONFIG_LUT_FILTER static int lut_init(AVFilterContext *ctx) { return 0; } -DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video."); +DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video.", + lut); #endif #if CONFIG_LUTYUV_FILTER -#define lutyuv_options options -AVFILTER_DEFINE_CLASS(lutyuv); - static av_cold int lutyuv_init(AVFilterContext *ctx) { LutContext *s = ctx->priv; @@ -630,14 +627,12 @@ static av_cold int lutyuv_init(AVFilterContext *ctx) return 0; } -DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input video."); +DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input video.", + lut); #endif #if CONFIG_LUTRGB_FILTER -#define lutrgb_options options -AVFILTER_DEFINE_CLASS(lutrgb); - static av_cold int lutrgb_init(AVFilterContext *ctx) { LutContext *s = ctx->priv; @@ -647,7 +642,8 @@ static av_cold int lutrgb_init(AVFilterContext *ctx) return 0; } -DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video."); +DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video.", + lut); #endif #if CONFIG_NEGATE_FILTER @@ -673,6 +669,6 @@ static av_cold int negate_init(AVFilterContext *ctx) return 0; } -DEFINE_LUT_FILTER(negate, "Negate input video."); +DEFINE_LUT_FILTER(negate, "Negate input video.", negate); #endif From patchwork Sat Sep 11 23:42:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30193 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:dc8a:0:0:0:0:0 with SMTP id y132csp2721683ybe; Sat, 11 Sep 2021 16:44:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCRx2MiXOLm9dRUo+IxxXjHHjMOT2VnZUOD54TAY5/f6b68mSqHFMFqRoHWZ7HhmJ+aQEX X-Received: by 2002:a05:6402:6cf:: with SMTP id n15mr5349804edy.85.1631403866806; Sat, 11 Sep 2021 16:44:26 -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 m20si741351edq.301.2021.09.11.16.44.26; Sat, 11 Sep 2021 16:44:26 -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=hCGz2RmG; 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 CEE6968A926; Sun, 12 Sep 2021 02:43:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFCBE68A9D3 for ; Sun, 12 Sep 2021 02:43:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OO2E/L2keGzUGxnFq/I6JaM11QGtXD0RuLXPDXFCOJev0suGQaRBSf7izd7rVQ26Tv+ZNcVIkIuEryAECQIV5WwZxEBAopXrynmtKSCSSJdakp7jSHFUl1XprGIvj32mUthTYooXoZhag6RIHMHhBwetSiy3ut8Mm3vnQpC+lMIL+gAubyWB1zAE1ZM4nsW03+NtMt1DDbVxbFMNix5qpoHkwerZMSsylLVUZC/FM1IwXWIyX8SXlscqO2MBkmwNibdNFhZWSZDvQvzEVvKqso/QD1/8DhN1c0MBHYboqSnLo1XRJB73mv/nX2FEMyzeehWmzZLFl3EpfWo1OWsaLw== 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=amKWRfYvFKPXHRQVJcJKvFruIne1fGFPL32xpoxGAuw=; b=Q90HgNiMih9prCe/2dz09+k6o56xpVQI6xQ0eUPerZWEuvk+t3ZLhEx5XR8rdLXzEk7EH7AUvPPJ5UkqBQBFAo0tjIZovP1ydGL2SdG6hrC0VHF5re/7/ae52vSfLGlpaYm9NvA1PEFzwHTgZkf3LKGDFCI+iR5NOxQPI2ujqNWCfy8S70J8Iz+CYnuoMRsKP6LjUArjGonqUo3nxDY5JbfO8YlGcDy1x/Uz/12RyVQzo5Bq8sMuFgiWoi5hVj5I/BtTJ0jhKWk7H6N/I0zbzGMy1WgOfd70++VH9Ve5WHfg49t/vhc/EP3EaKPYmCsHKn5p7ExOp9IMx2g5BW630g== 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=amKWRfYvFKPXHRQVJcJKvFruIne1fGFPL32xpoxGAuw=; b=hCGz2RmGjN/ET7qvMfkLQZkEfMqk4G3GBxitck41SQ3uXKNyO2s3dAk8s2XjVB6nyIH/EPYnZFMpYgV5yN9uCoJMAHqznZ5RswcLzvxqIom2unhu9XFvD7lWPKV7GWK/JX5CXoay5kDPTDTHs5w6/LdkjpM3K3eUORufnagbz11QMtCG2NzAJZ1ybJ42blWiAg0STikwAo1ZeCtGBEAyzJfmtbythH1d1muMoh8XoblbKsWMobduMzaEdWD+yepfx7tRIYruzNriRUM7FaoVRipSkfqKAmvcEHY+n9pi8Z+OAgnmmWXcHR3ugopvYjQvoMeWu4/i5cRRFn7XhPpWKQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:43:06 +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:43:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:42:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ZH4iRhLWmzMYLwFqPI8gVqvIRLf0jluN] X-ClientProxiedBy: PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234244.2306938-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0107.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:19::23) 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:43:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2e65e44-ef76-4345-da56-08d9757de760 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9s0YsFf7lSoleyYPNwKNETk0D1HEHSGRSo57yWhN7ud1pfbc58hP0ntUyieAWIBoaHo6LMaLcasZSiCMfuYB7TM3RTw5Y3yhcQvNbEpbCNeEV2facO9NJJWGoH0JAYMAvJMxG8xsRYHrnQSGiB5TLxB5AZrkkxmYvbNL2Xq/POzSrEV6l4AGySRtyZpE23o5ZzfhdvumxzjUaK2QYU26SUfXiBKHJbBU/6tQDOsxyvkKy7FLKD96peOFZcunBejgbwazCrQtBfV3HBiXmeDIygss3sHyBFwd+4rbz68mDRYQPN23NG2zlKPWkPSzkn9o0zSTHVBh4cjsBB9Qw0Zc/0Y8/8psWApeZzBlBRYtyOFDxN/jW5UslOW+x0vcXELIzL1BhpMMy4ydUEgro+LC7rzfEarxciF6mW8i9/VIazghNIcalse7i9juOJCdGYT/T88o8eCxfuDOesFS5PlVMa2Q1hLx5Zc2S4asbQPbahiSNXpKiHPGzebpO2yXri6ZzVYgsMSswhtDKaFAQbBhiYsVskvnVNB2PVjtBU/rB0AkSHxKoSjWN8Ymr50ZEgyORPz/7MuTOu4gcG/SVOOQAHJoN0gosWmx/nIPSqUwbpFcjIuTKv7xbP4U+QgGmvI9dW+OK50hKav/jp5PLjgMYfXjoSetc5Sm1/9W1IqEh6CVZx4F0zMHu5SpViobbXsMnynrSRN3mlbN90tVM/H4SThDabFrHePx/MNY2PXdq2fj7/Bz60jhEkj0= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rikzwfWrTQCfzygL4cUmoWwBF+O/odsRejQKMQMxnLo7uwnwVq942aJzInkTDir2+5ZwQGy1gX69LD2UP86N0aLOBeZncxixlSxxSQ0Crgjz13FtW7wP1Qi4t+hjB4fOMdd0WQNePPa01dgZyP/X++DnUMuh2+ZCXb8WcRUtsfZD02gB6UK49Lpq/NGHUDfYdGoKy141tkf4HTHhqKnLu98SS2zXKDNjHlTF11fz5f2DGQZqFQvWMVpj+BWswuF4gYjVX6UGdH8pq4IDxB0udZ/rtoKZfDTvvekqTICrZkii6fAh1QaXgpZEb1EPH5nrUZQA6jnejc5BPPewfmqC/MW3XYLmy2QM/WzjQaCWRkxk50h1N8YqViQFc+hzsBsScPQ63ZChMB88Wr6rMB3zv54MM8dX8Yr1mD6EiD2CdfFQvSUf/EFbgDbyv1GAzjEK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FoTaMaHIiOjWPKjxnXSqGiCDxYaO/XjGrot/NwLBGgUNaQto6wxuwiuh0aNqTnPWhBnn0lQr/ksM3f8jmFSBvNVEZXHt9b4yt92RoO5NBvD0B6Jbh9E89guJoeqgyRmxyHIPzOMv17hthY40MEAa9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2e65e44-ef76-4345-da56-08d9757de760 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:43:06.4833 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 21/38] avfilter/vf_lut: Remove empty init function 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: C+drpCNZVvpx Content-Length: 931 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lut.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index bc9af9f609..d335fd6c39 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -607,13 +607,10 @@ AVFILTER_DEFINE_CLASS_EXT(lut, "lut/lutyuv/lutrgb", options); #if CONFIG_LUT_FILTER -static int lut_init(AVFilterContext *ctx) -{ - return 0; -} - +#define lut_init NULL DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input video.", lut); +#undef lut_init #endif #if CONFIG_LUTYUV_FILTER From patchwork Sun Sep 12 10:53:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084025iov; Sun, 12 Sep 2021 03:53:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1XlvN9VlSXXEiXZddBqKT5zeoQdCJ5ra2flNIlEKyzVfQTkIQ8AQW/BoSaUST+xOe9rxn X-Received: by 2002:a17:906:31cf:: with SMTP id f15mr6936145ejf.272.1631444039784; Sun, 12 Sep 2021 03:53:59 -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 w18si4179177ejk.612.2021.09.12.03.53.58; Sun, 12 Sep 2021 03:53:59 -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="A/U06x/1"; 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 515DD68A858; Sun, 12 Sep 2021 13:53:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2055.outbound.protection.outlook.com [40.92.90.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43D4E68A2DC for ; Sun, 12 Sep 2021 13:53:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cCVMNIFYN4+tFp1j4+vp/gRzxqi9GaAzvOPAZB2WPAV1hiRpw1mPkW4+mPmfU1LEFedbykq72mK+QQBHSkx46kfbWl+CS7VBNeOBWH6eNXHg9NfKEurnQwaGO4VhFKeGJd1wy+PiW/otyAabL/ETNQJliVbEgtBNF1KzJCbJoP9NAWR6vyoqQjsXzGnUNI1R5bt3VX8kgT4NWtdpoAR9XMgtGwic3RBZ8jsrsjuVm54ZwjsXplluy+NjtnFiN881v1UAXCF54eKPA79eFoZWEi6TGL4kwjdaoKzf+qN0HB0kpqlLFyR7gMUoSdysQyyv1nkFF1An5Q3o1fLHxqA2Og== 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=qE/yrTh3Fuk9ehA6S7bj203DjCj0tvOje60w2XFNxXE=; b=DKkLCpngzrS0Ojqq5MkK9KcrFhun/sHZEab4sEG1xCDfPivGQfbdJu5A9qzgHAkAa9vJJAN1CogzXC42TSSfcHOj074+B3xqAZE3xuL6K3t0J6VnOQfb+O0n8gEYBU0NOf73s55PQ13nQvrvzuT/a/3ZKsb1JuvjGLv5oUf64Nf243ibeXDOumzcF+EdaEtQUTcrzS/jkD0b8mZRPs8p6YZBSRGmNlztki21EC7sQeO0EkVWpbHT4cm7a/bIs65VJf1PqufXyGyCXC36XNLF8kxsT57YxvPCSRLmmeLrvvClElNCDmqjNx2tnCd2DK76wmV3LXcjzY/o/5hOOpy5jA== 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=qE/yrTh3Fuk9ehA6S7bj203DjCj0tvOje60w2XFNxXE=; b=A/U06x/1HNBlBtDTPQ3dI0Dt7o8Kk3cKaFn3RPx1nLZUsOrIupu/fPn3tf7bwmXTgyDQxpzCnlnDnpWI889VNLMGn55N+tR41TueJRHijR1NtYrQ56czkyqHPkyEhWPC/XoH5tO9MTc5hIy3m5Be/OGUJwoyTul0qCye2wD/VBSVArzYJ53EHiesMQ+AxDuZ7ES8R98HfPUwGLR6xHp1UIkTgxZANmCd1VNjJzrOEYuj2OLfW4Ic0eSoOi19Z50rfBsoeHoJ9nTj0d12QQpagabfRjAi+pQ6X/gjn+JgkVVuPJ0+ZXO3y6ghl27yzE54ZOTwvyVV5SASjmFGWf1Ncw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6628.eurprd03.prod.outlook.com (2603:10a6:20b:1bf::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Sun, 12 Sep 2021 10:53:43 +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; Sun, 12 Sep 2021 10:53:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nPc05gHNJ50cD+zGxXvHT38tMZfkDknY] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:53:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16441581-7b56-4038-3864-08d975db9607 X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUgjNzHfsOI/zlqEpKtUXMyvn6K2s3UNA1qpIFQKGSD11JAMTxU5aOz/rZuSAq77/bBWLm1FjGHwzgW2S2HqtYveLWmrrsAIpZR2kHw4HqLhHqIcXRHLMT7b1JvIKfr89UjFkL4wnTfuGO+QLc2XgrLoNrwQxBgQ0ZOvYTH8TRu/78AxloZZOqLzXB21lNHNAWyvuU+VQYu321lQLoyS/QYUoWU7HZfSp6b0c56Yi/8j5JLYyT1i+KnnCky9Ma/uIrl0J+9emNOXAmkROZMgAojc52s5SlZnv+7ArNfQSVwVIBKN+I4o4D6AdkQE6O3YYrYfU/cPmtw+JhtRPPOu7PjCpByv1aoKAYS38b7LdA9KgiWEIGTs5acIe1cV9gcWO7OsXcrweDwAbJapzDzcE5CV48DOambwb6s8ECOHHWNYemw0eR9jXaVUTH5OxaI0PLiCrmAxdBnT3ALtuHn9LDv4Y4aZJC5hQLjNJH7DGo7dRModSM3mGJV8xDWf/z4Vx6/5gD57fSBCZCh4SumyuqW2UJa5VlEv9kuwv/hWM9dLJ2OuVO5EtDnbuCkQSC6avSiOCs6VVXfHVv5j14u1IJPc94PrTzvQlw2rzKmC1djwL9OTcTXnZzO0LSjhMdBR9gud3wOM7ZlciHufRyr1AJcPmWRVIbRwJzxD4GiTcaaC+OLIW8lPHzPbnt9hjdT7doiWlJ6PnRcjrkg== X-MS-TrafficTypeDiagnostic: AM7PR03MB6628: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jpmBGgu53bA8rtqw+uCFMV8NRWL94FDDfIGMaUAa8U2K3cBfdcJLKk3OyS8nL/XChvvzVr+27Ju026HJyt3kSsOOckQ3IftBVTLcrhW5gKZqpTDXlBixUpB8wfaGAN0hg5AElGOOW1ZllLFrO1yWP0fGU7BnOHZpIL7rz3P78nF8azBjhafTl5G7P8M4+nyWNTGA24tYiM0NbUi9umwW0/dSNa2hryN2d3SQbbjXIxMgFXNSiVorSe52X+iKJnwS+W+A9iGpvPi7ZNmI5+AzV4tbcWtO8liwJeHTqarN88mzVIIAur5fdScbEa5uGq7JfYt3Th4t9jEyVm0oIzsFBLl78LorRfONBTB+oKc97Qivy+gGsn7R/692R6kIOAwESLFyrJzi/5NdwDNL6zTTrPV6dRBoL4aYAcM4nxqHcLbINI3JTknLVpQuAcR49y47 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dIYDsWxqz2zTGiRiZONT/EdY/NNuMi7iQcgw4GVjgkpBz9MElwmFwDv2uT2aFLZi4N28vTlNzz1nCXlw2kpCmcpapq0nnqQwX+sQChAXGTbR8sdsboA/oplgllhjHmoWXN5iBlDr3Pfs7mgyzLsGmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16441581-7b56-4038-3864-08d975db9607 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:53:43.9316 (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: AM7PR03MB6628 Subject: [FFmpeg-devel] [PATCH 22/38] avfilter/avfilter: Remove unused count 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: UZfmaA5oIk8g Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index a04f8ed62f..c614eb0740 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -812,7 +812,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const char *args) { const AVOption *o = NULL; - int ret, count = 0; + int ret; char *av_uninit(parsed_key), *av_uninit(value); const char *key; int offset= -1; @@ -875,10 +875,9 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_free(value); av_free(parsed_key); - count++; } - return count; + return 0; } int ff_filter_process_command(AVFilterContext *ctx, const char *cmd, From patchwork Sun Sep 12 10:53:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084120iov; Sun, 12 Sep 2021 03:54:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsQBhYxSR5YdfEp4vnHwm0XOpsv8kNP2Ne/GNPg3IM6kqlxmDMd6883FFE89zRJKNBsa++ X-Received: by 2002:a17:907:9854:: with SMTP id jj20mr7198146ejc.133.1631444052095; Sun, 12 Sep 2021 03:54:12 -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 ne17si4830752ejc.518.2021.09.12.03.54.11; Sun, 12 Sep 2021 03:54:12 -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=JLKYWQfJ; 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 78D5468A880; Sun, 12 Sep 2021 13:53:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2066.outbound.protection.outlook.com [40.92.91.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 423FC68A874 for ; Sun, 12 Sep 2021 13:53:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPWBb0ZvdYgJd8Sjq7I41nIhh8jcmezCH1tO6HLLsI45ZYMleymEvdp3C2iSpRy9z0oACtPhnlnutc57T7xOaqHjdDoNj7TDQ2ixgDdzWhDoY+KT0x6KwnoyiaMbnYnCvc6gxnsPLLm0lO29exF/PVuvHXY6AtimgC3PjPFbeL89Q88qDy6BK2zdZJeO/1eciP9Mvpyht0VkUcPY8YkKDB/ryzSAkXD7fZVzK7WtEpqQvFv/wDJgPgQC8gKeUI7sUB8Z3oJ1Ug8/ug3tnNjYeMhm2/ZgtXDi95k2wAvuwTOKKIhD+XxoMsW3QrZ0EjpVDgF64SX0UhASBfz1ILZEHA== 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=a5XCAoJ8W8d9O9kT4WSKdkpek+ST5FglRMZVd2PMRAg=; b=aHvzuW3AXJ6Uom9IcqE+7qibgN4vinvFmgKqVcu2idGOT1ymsHe4kmBQyauOLYU5J0nU6nIotx70aZZh8l9e34jpvMN3mbWa979Hs7kQjy1qIDToLNuLG2IRVNnzAPO6kyCW9K4jGWuWchtH51N5K/5EDYbzHnHRGRsKHDgGKQb71jGP+XECUoWLhBkOFeGAMOhwxcTaak2fO+LvgPzbOAGr3sG19IuDaQOUDVI9IzaFruJIOi1lzoIM10eTdtdmnezfBkLfvo/Y9o9aPKElOZYFTqpnPpi6Pcs+TXryF4s77nzCdak5AycUGG0d5uQ+16DtxFE0wafaNM7HYjPGdQ== 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=a5XCAoJ8W8d9O9kT4WSKdkpek+ST5FglRMZVd2PMRAg=; b=JLKYWQfJEzDq8ggnju97MDSDk7Eh3PszNSuscplAjFA7I0tnVyDI+EVnEVwN6SI6+LXwoSq3Qk7jkZlNS0Hq4saLj8MnLwoIhKPH6cklnzd4u7WuiGqYu7efYKzRvVpfkroRt0s2w2kIzsrZNxjZLXIhmcRTrMEPvl+j2mdN7DTuQuiB9tNMAesm58FcgBefFUkFCtDPHwTmUJx7APqMrUTE1Oec2Xuyi0EHCxmpZ/SHElDbDnshS/tjias8/uQzYj83chHFZeklaeE4eiuBcYhRggaOap1H7o7RKdeAu9emx/PsE5gbfXO575AtAPPU28Zd1Ebqw7uLEwYooHWqNg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:53:50 +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; Sun, 12 Sep 2021 10:53:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rUKtLZZBqIrqZrkQbnJpAQNXUwd97hyc] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:53:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b53b48dd-04b7-45e2-cd87-08d975db9a4f X-MS-Exchange-SLBlob-MailProps: ERoE7pfUhoZGVchj8I9Akwve2PC2v2qPqZXcyd15gt0+I2PuTHGd9HdG7FKnz/whlmr841mGFpf8j6ejC+Z+nD/VoPmM2IFDHzHCTJuRbWIvKj9Ce/LINvwmMa+8gP+2XRUKG5YLCA2ZxlYaaIxHbfgAFEIuZuONY+jJsNDGqGamM0ZLvVG3In4TvNkfF9uoVy5qMNy1QPJ+6QWJVm7ULtXS+JqkbJDLlmUOGbQj1wgxf+e7g93bvgPB1V6S3Z/DCBW34CV/lO0GuEl8eIPf7U28lWd+iu/2GF2zUTpqXlVtW2Z3+FXQaaBoQ+N8IVdJFUzRapko6buJOJKejZefImQqkVMtP/OwtyEiTbARgWxQIMXk5z4G06w102hGDBsyBCaGk8FKSiXcUhsCFAfaw7Dk6UkM8veYuAol6DukAOmyAC7ETHwwDW+Pf2JbFvGT4C8b4s308QuACqHSXJRNi7ymOypUgjku8yCk6iBPeODvnJ1YoOi5vaAqVWUFaqzsQI+pp8eJMB4+lF+Uk7i/Ll82pYTRJhDdrxKRSpLuumzSb5uJbHLKfLVGzZsd3vXoE4gEtRxAUeP2sEDWhVozU9YziCsLEcFSDL+zJPu2w1Jq8Y3OEVZ33a+0/NsbM6PaWgfSu8TX2Zt/Cmaw8vEzTof1e+aYWHZNQwuRZ4WJIr00gy7ieZblCg== X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x94m6aWCCF8BOs2NBerJdnyId3Fj1qjI9Ng13YywVxpbCehsrJe0c92QZILoXO1fiiskAFkojtHLs93cIQEaJIAPbtaLkG4BWK0BfTcdIOY+29Wnu1AaVVq8QNwmOMBCskrFuvHSgJms7rm18ykabUsRWVsXsn+sG4tyh5Zajz0iwTdqSHHUDuEiQQ8u70KT7MlzurDkyUX2Q/YupTkk4aKRibKBWR1z5N+WQfc79xrzm0qLN1+y0OiINbkwskmSDH9irP6fwCf+3TN/XgEaw9YWEYxKKp15sWo3ux+2Qml/lsPfZU7ooz+l3VvnxPe0jHHG3gF9aHfS27mFV7DlvqREYKwy9WZIlCgNH+t/WPV28rVSwhKCLMBrlZAD/y8rNHAUPQ3SaaD4EaDH1mS9GGJURvR1qF5u4BmoGCuMExo0A/LQUjjds2U0OG2ABz0Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WTtN4by1KkvYPt1cwdO5M1DK2oIM7hzR7dM9q3zh6knq51opeBgr22lIuMkqhpBMOM/zrbMMLDBetykVLYlaeYn6zljINe/44hxU9rZsRfVVSDKECJtAlLkV5yK5NC7YrN988znYkrFGswx+9Im3Dw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b53b48dd-04b7-45e2-cd87-08d975db9a4f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:53:49.9144 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 23/38] avfilter/avfilter: Remove redundant parsing code 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: pWmVr+x1X4ns avfilter_init_str() (via process_options()) both applies options extracted from the given string directly to the relevant (private) context as well as to an AVDictionary that is later given to avfilter_init_dict() which applies these options again. This is unnecessary, so leave applying the options to avfilter_init_dict(); this also has the advantage that all unrecognized options are reported before erroring out in case there are unrecognized options, whereas the current code stops after the first such option. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c614eb0740..11d4e01807 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -853,25 +853,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - if (av_opt_find(ctx, key, NULL, 0, 0)) { - ret = av_opt_set(ctx, key, value, 0); - if (ret < 0) { - av_free(value); - av_free(parsed_key); - return ret; - } - } else { av_dict_set(options, key, value, 0); - if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); - av_free(value); - av_free(parsed_key); - return ret; - } - } - } av_free(value); av_free(parsed_key); From patchwork Sun Sep 12 10:53:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084183iov; Sun, 12 Sep 2021 03:54:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwfgI9ZCBUC1HvzfxyichZ71PYnD4FqDtrHWPOItmmQI3e5pja/+z7ZDww+veByM6FHu99 X-Received: by 2002:a17:906:68c2:: with SMTP id y2mr6914275ejr.18.1631444061773; Sun, 12 Sep 2021 03:54:21 -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 eb13si5207870edb.3.2021.09.12.03.54.21; Sun, 12 Sep 2021 03:54:21 -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="ayMDV/GM"; 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 894DC68A8E4; Sun, 12 Sep 2021 13:54:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2066.outbound.protection.outlook.com [40.92.91.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5851168A88B for ; Sun, 12 Sep 2021 13:53:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOUEQnQXgwtYeyibeeBwYJ0dphottxSOA8lWTQndLRrVX3bJsHlj8mkTH3ZQQqc5ffJRtiEPLq3I7NPrXXKpMavhQfg7jeNOdTWAFwSmuRvrDVLFm8AQ7XjKByW8INOazGI7nNrZlQ4RW1VGm4ZO6I0XNT/RyfIJ4qfnlP0PimTNISd6ePIevMhMihkAYLCmWVL3spKmeICNdD8L521utjXdOIwf3eKOazrPpDjhQrPueDVWcjpw+M9h0eJGl0KE1bPeI/PXNx3Tg28QSvsq6hbpTMJ/97n1sw2p/QTZAAwcZI5p9N1OP0xH4sHAphN6aopU7YO+n+DtTC+ndMSlPw== 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=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=oFOWs0MIRdsJmIT2JF8EG2PDCG0Ulzmrgwzg7pGu49hCy5Mq7BhWapvrXZ7wxFpzoniMsqBzRWM+udNjMiBUlrf0UI4x0Q0WLt60VNAS+yX/xwimW5idXHMkFKV8iu8BlcPAKYtgomIiTdgQW73sPfeGrExGrynSC1uTxYZNB93e2B1aPidHf0uuTP7slqmCCSYZ9/CoLJz6qMMXP8HscCjjgO7aRfxv4Wa9qzuyHdjWYzmQu9Gf9h7h+zgzct+XrpM0vpd7ZG9cLaMiahWE4QBZubTh5XPqfLt9KaYbDoeuRI7IZ/zlHJ34wBneBmGcSqBDiqgF9SuutiS/4CG9wg== 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=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=ayMDV/GMAb1AY1GmD9v9vmDjraJVs5zgxDJNWrONgRtc1TZMjBmx9to5pkymunRu43i1vbyvibspYfMWXdLM/AB26YlJEYZoBZa76idarZRXbpyWMn7xHS1Gw+vDC8R4PCAO9LAdzzcuNlzmxRnecRdl0PGge00GaqFgkvlDdOSbCwRnP0Dmy1QqI0qJoDUNRybnQEarPBOsOkzlI9Nzfr/0e7hfs/O1o8sRXmmHnYf3WPtGG5l/4uN8BWslqeKlzZIciE7cqh8k+Gllqd/NGjRq9AAxzNc4z2fhav/BEudSvlw99UskrUXkXxiF8o+DP5xl3vUVvVBWSpX80hSAGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:53:52 +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; Sun, 12 Sep 2021 10:53:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M/luY3E/9w7TZbkuds/9qwRSKUGl4t/3] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:53:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0be93fd9-a255-4825-cdb2-08d975db9bda X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZI0DtLyvYyj70MAG2o2zhpqIu3PwTAqB9pMWd/VFGi8cA3BUs41G4IxUThDNeTdTHDsPBjXNvMJ0OKfgcFW4Jm+8hY/ZcJgh7Hk8XlTRMYssWXkwi4AHIXeEA6HVhJu98QZ50czbdDLrKJD05T11VGJNXMrnFt8Eo9ALrTbr2xERNMtkk4LA1JU60KdfJgPJv3h1mVnchkvyA9ms/HL4AuHVFtNcOgOJHEE1i8EgUzOlIWmWbG83Gw5p8kOepD6b8hwfo92zywNapWbexQ7i5M0u4aCiumeKKlmt+lc7aO3iZdcfuj/rdnpH5ljVFJbWvc4Opy1l0qrW6mxdMLleyfxDm50qaum7zRsEBuGOZln4jAf1gM3XZAJhb797B9X0ljMXcgCUPQ86Z3wpDaW350I8VW8S1Ci4+2/Qsc6baEz2rFAbbIHEPldlL7T9C5UTbuzWae5hf2ypayLKEB3PFrpFVqQPkn8oq9CxAmcDGz3cSN2HH1tk8T1mYvA/lPyVH2axmF7gcRmdyzLe3ebocGxIrUwDVmlds/jlWsF7gexJWsN+tyidzcrL1PJGmVQ5LWFOOvCdwbsTKH1FTSb5Aq4Tfig+0AcTk7PASsOJbgLA8ua9ILiWgKVfEFGU4+ajPLY+8zvWytfhjgCvQz5ngNKfwSigfh12eOHNqX2JZZGbtmVe6Vl22c7NLDcLC2dVmWYI46H4eTCvY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W1sxiwKvKCosvfMHFn1U2hX/CiLjph0Hk/dnE5I/lMoYmv7ryhniQyvlVKisp4xKHs6/jYxq3uRZszhEENlFDoArV9CSkr6XR29cKHzOp5DeMiY4t1M9atk3yXUdLVbbEsKONpQwdNfSoFo+zn301l8n46SLR0gMR94kaeFsqMnbeMHN20RrOK/9YGAZnO7w3sJBwB0TsODl9p/9aB5wWGo7oVeh5JJZLzNfLyDEdFoAPptMb2GLBcVDXfDJow/ima0+FbI64N2WG8Glg7gpq5Bxk174BocAn/9NujcqhmLU5D1v5bMgCFcJSXZ7Fa0lvexLJ9LN1GNeAJZ71lXVjR+WjjGs+gI71SbBmOJHW0kKhmXUCzy0SLqy+KWXzaBigrArJEFZeErrj6QuSwo/fLlERJvoBc1wzUYu+iQUWGiRohyoAlSyx0uEjmQ6nAK5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mJZcAfWwAqqbTRKBpi5OZIJ0FDY7yt703uDuJhahEpocENDYIBlu/gnGdEdwydAV74AYo3NcCswk/JQ40/qCMOl3rIjOpM7ZEI7FPc3IfjIO8wnUJY0Omz8d/ZWnfanG/ao6ucHcKViun/IFKRR5Eg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0be93fd9-a255-4825-cdb2-08d975db9bda X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:53:52.4742 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 24/38] avfilter/avfilter: Use AV_DICT_DONT_STRDUP_(KEY|VAL) when possible 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: 3OlIEP/Y8PRE Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 11d4e01807..cc499fd5ed 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -822,6 +822,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, while (*args) { const char *shorthand = NULL; + int flags = AV_DICT_DONT_STRDUP_VAL; o = av_opt_next(ctx->priv, o); if (o) { @@ -846,6 +847,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, args++; if (parsed_key) { key = parsed_key; + flags |= AV_DICT_DONT_STRDUP_KEY; while ((o = av_opt_next(ctx->priv, o))); /* discard all remaining shorthand */ } else { key = shorthand; @@ -853,10 +855,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - av_dict_set(options, key, value, 0); - - av_free(value); - av_free(parsed_key); + av_dict_set(options, key, value, flags); } return 0; From patchwork Sun Sep 12 10:53:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084242iov; Sun, 12 Sep 2021 03:54:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4/M+6tgVEnT5FbnNR4WbDDnjccsdFfSnnfVQFuHrJNfr5zhZlkrTOdvpt57QtA0MEvfBO X-Received: by 2002:a17:906:f11:: with SMTP id z17mr7036291eji.385.1631444071783; Sun, 12 Sep 2021 03:54:31 -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 y6si4350814edm.581.2021.09.12.03.54.31; Sun, 12 Sep 2021 03:54:31 -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=OAxCX+mG; 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 55EDD68A923; Sun, 12 Sep 2021 13:54:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2054.outbound.protection.outlook.com [40.92.91.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BFBE68A87F for ; Sun, 12 Sep 2021 13:54:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuztNYRi5Sqjw4BPANuMd3NZDrLbEWcX1gC9yA2sZ0s9A37ICsd0CwhI4iVS/8GtK0j7r2ZEm9LhbLYf5GRXuMytrcqhJ+kToNwqxT4KjPpoPb82FQgTbyTVbTH9ZbUObSkiVjAmPs0p2xlcGU1OATHlRka3njMS3Ra036DOk5vHKVkx80O2yTfjuetJ8VJCJodthTlAkDyCt7Va6m+enVUNSkGky4sBW1WvcwowRns0Y3RfR/iyzk8Af2OKwqv374GH5LmeLyY4anYyx7l02Ng3KHLHJa7XIhpuePYIYkXLjhKHE/8WMEzf9J19rPiKtS5WdDTZdMG0JxnNMyiL2Q== 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=4WKJe+fYBLq7URi3ezRla6i1p/s3czLWwUqFDbn2hmQ=; b=YnBqPdZmfAKH4Nktvemfm8PMqG97oUEYf2j1vTLlvT0Sv51UQqFAgerUBx7Fy82Pv+P88AH16w7BzYHLulC/mxbfTn1hr1bXi3dncffYv7ZQ22Jo8wzgShMW0+IhUJMlj6Tr+CQt78GK0JPnaCQP/UJ6zeyJZQ/TKvlY5HTqvkprzGqa2cJpb2v6lTBl1qHk4NJPD+GQaLLKepd6zx0wmcq/ZEud8Hb8ua3fg0paq/LTI7MWaXzMO+u9f738lqiV2lxUV760/lAz+X9DEybyFKQLPc0VlVhZDEt4ka9DHmmwH9hFXDPavCPqFf3NEVyM0qd91ROZMTJHii13EP6FLw== 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=4WKJe+fYBLq7URi3ezRla6i1p/s3czLWwUqFDbn2hmQ=; b=OAxCX+mGn1nSIhGVNIvnfOYlbh5F7Qeo2dLhr/R9fLq1juvxbOfePXrHgeZVeFNhZzibOs3Qsb9g4VUL+T1kXISWEWu98LSdrqSWYNBOs9lXE53NoUSGT0VFwt+g4+pJfAg9sIvd8hjgPdahL6xuQ4OTe+u9nKV2aoU+JqW/GBMQbqDLtyKPTIIRP8Q152o+4Yc0vaOXnajtD8i5+CBOAO5RPBZigsBS/TeuOn2RlrDmvnzxCa43GdBtEmhB6i8U1gjw/MoZlbZxZOAAqRLoKfwFx2G11TZvUAzv1IkTYpIfcZsLJvX0ivx//EGDc2noTWqm+0IzDvkx4aglZIx6fQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:06 +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; Sun, 12 Sep 2021 10:54:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ygOfwlRFyhEWPLml9tPJ9/hZ+OeetOO3] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9244ff24-1eb1-4707-46a0-08d975dba3e6 X-MS-Exchange-SLBlob-MailProps: ERoE7pfUhoZGVchj8I9Akwve2PC2v2qPpN7mZhrewg+itUxncK11bwkqDWb0yDyrlGxQYajWJ6stUrWR9aNLk/mSxGvwl1qmtL/9z2qQiXQZBteFr1KBGI67qPKZY5MznSwWTY52ZQEg8fW5aL6eZPVrkd0zNnDKK0Ym3JJuICN9IpsoSi0B6xO5Q0M63eRXPOMtDqliDM0frniZq1NW13vLC3JTmaiGwehcisz+l28W/LV3eJ3L3xLCKa24G9C5hlBDmV/BsltokmbK0yhXNEot90NJm/rpsaEe/1RNiDHG7d9kDuXN1ST6gyot/CE3faXAZ7/9nLaOMoXcAQH0XkOkyP+wDcuWoeliiyvMr0t/67rlSm9YarmbTdRT8D4PddZ5lAK0CiZs+6qt+5otFX9RnViZ/PtZu7sajJj0BcA5ebqQ8JDZTty995csC5kjQypZzA8hN238Qo8YH97mnISwJSEAojsyG1tfh8+fbd/GkVAQK+CMWeViSrabQ1eXls0JdA2tzLrvPf9fdLPZk5rK57U2ODB5uHyDPI0kCvNqybdwxXeQ2yKA+9cUAjmzjOhZz/Ns8XJpjz2En54jUTBC8fpdg1pc+KiA2aWqb/jh9H+2AnvgR8YIB7i4+/kCOcKFYd2d9LbvmtAVg0MiWY7LzrHUYX1uvwkG4c1Yld6jeTRccfmx5Q== X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r+iO5Qnp+khYCXm9XP6DbpbcfW0RWW8DrI0zbe5O+op9yNft/dHHdLigzQiFKV2Hy36JINmlly4uo2UWNjjM31pSzBR0+Smlo58O+keZ0vWlYZOxwv7e1bfRcp+I7MAeXdbFixTPX5lsZ9zSFwWwJz8QgtWcAOaWFIp1cThBW0168mxqJwpo0zqkm0CjDPQtYcVaOzSt+5YF+JWkEGm1sRnyQuNSCHaG3vMadCoe6Jx+4eHNdk187PEktMSfGBAvTaxCCvZoh1QG8JTU57L+wFip64Up+cduoGJtkcXwXFOiGhTNtSDe87NZCS9WllsHeF5Eoec8868Y5OV1ZGWi0+qjkNddLDb9XMRv+VjVItb7Pf4471UjYY+P8VcRp8a5tZt1Tj+qSD3QHqpwyinxn03X4RLQg8pnBNLsbkKU1GtpLr351eEgB1GxgyKcdgI5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I7wSr1eT2a5vsMFGruKgPGuqApx1nRKRDu34VAKkftovX2geV2MSBNieg2hrQwOkqLh1MZ9U9TMD/nnjdmgzdRzeoeGWJYO80FR8APArTNs8cfcOdGeC0P0nh0bKzycc135rNcErpUnleZ+QBan2MA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9244ff24-1eb1-4707-46a0-08d975dba3e6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:05.9861 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 25/38] avfilter/avfilter: Honour the short options documentation 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: YApZRyv/7lWe The documentation for filter arguments states that short options must precede long options (i.e. those of the form key=value). Yet if process_options() encounters arguments not abiding by this, it simply treats short options after a long option as if it were parsing short options for the first time. In particular, it overwrites options already set earlier, possibly via other short options. This is not how it is intended (as a comment in the code indicates). This commit modifies the code to reject further shorthand options after a long option has been encountered. After all, avfilter_init_str() errors out upon unrecognized options, so it is intended to be picky. Signed-off-by: Andreas Rheinhardt --- The while loop that is removed below is actually just an elaborate "o = NULL", which av_opt_next() interprets as "start the iteration". libavfilter/avfilter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index cc499fd5ed..165ab1f44a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -814,6 +814,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const AVOption *o = NULL; int ret; char *av_uninit(parsed_key), *av_uninit(value); + const AVClass *priv = ctx->filter->priv_class; const char *key; int offset= -1; @@ -824,8 +825,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, const char *shorthand = NULL; int flags = AV_DICT_DONT_STRDUP_VAL; - o = av_opt_next(ctx->priv, o); - if (o) { + if (priv && (o = av_opt_next(ctx->priv, o))) { if (o->type == AV_OPT_TYPE_CONST || o->offset == offset) continue; offset = o->offset; @@ -848,7 +848,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, if (parsed_key) { key = parsed_key; flags |= AV_DICT_DONT_STRDUP_KEY; - while ((o = av_opt_next(ctx->priv, o))); /* discard all remaining shorthand */ + priv = NULL; /* reject all remaining shorthand */ } else { key = shorthand; } From patchwork Sun Sep 12 10:53:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084348iov; Sun, 12 Sep 2021 03:54:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJd/wAPinscKvTSLdiNRQt56Pr95vLKZdwROwKU9U6id4LWf94iUALldwDjrnoNzlQ/1bk X-Received: by 2002:a05:6402:1508:: with SMTP id f8mr7467698edw.255.1631444081929; Sun, 12 Sep 2021 03:54:41 -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 hy27si1241307ejc.705.2021.09.12.03.54.41; Sun, 12 Sep 2021 03:54:41 -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=GoKtaJs9; 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 90B2068A947; Sun, 12 Sep 2021 13:54:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2054.outbound.protection.outlook.com [40.92.91.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F8E768A8C1 for ; Sun, 12 Sep 2021 13:54:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e7yJczHJj/YSGC4bZIOBA95Eu62scWOrN+pbuTvvEXzi0zcybN2qAZ1teYy0Tuj0Ef4n+1jBBpyLtdgyXtjOe9R4E0s5gaZgehBAxfajcJ0VQEwrr70ZLiqH88s2afXQ/uPMuhZVh9p9f22cAUZ6CiVUJwAZJsuAG5wqFRTdOauy7d2Uvq+i9OBQceS2He8ZyRaOLgQIlau4n0dD9v2yIU5Onb1s4knmbpOSxbvphQ6z/rHPcG9oyYvFNIcslccfg6MvUFzXTVRwnbCXxVA62FPj4qn5WLa4Oh9UJhRqa1UKFoX+uXkQNPNlr1ZebYGacRDPzPB1whgOGqKpyBbWOQ== 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=onfZ2IfhcZY7fmks3/4kvVLVv3m6yXp90b76bvegPSI=; b=dx4iT2Ro5ulDGzMLzBlSz9Ol+y27XEZK/SUBteeqlS4sji7EV8N/Lu4s6A4gzvDNZ3UeZwsFVMt9kE+xC0XRmQPBzJqHwWBTf6RrJ8ybSogoEfjHMhetfzMGMdum378Cb4TUMLdgX+hOk8mHwbApGLOBn+6NWKfVowGBovntfiJa+A0i+nyCqXOAmJQdN8/23enlDMUGCv+Xr8iB/nVHqxCCD2e2Wfy/Gmf191Od/dVydlHK4Lf280PvOyQTNV4byN3ZlkVTbM3OqhQTVJchM9jNLmhggOTNvcRJWIKy+d5lk4/mFTlemNjyEUQzB2AGzio9q+WnMpzMD76i4Rf2uQ== 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=onfZ2IfhcZY7fmks3/4kvVLVv3m6yXp90b76bvegPSI=; b=GoKtaJs9s8YsSaV7wm9zbU1oKFcgweQPXyofsXZuPcMCnw8rB7OXA2y1n1DpTUEbOQXxdVPhfFbbmEGL3lLoIwzEP0zbK8Mn7ZLGxRuFFZsPl+MiXCS+mgAAzeTj5c/vgyGmTKRd/6NaxTpJI4NALv4xIuH9PANT4Qe95KqJDz+FLi7UBDLSKlpjot1KDCrmdGSf/upRlv5AqRI/DTHEEVhIOMd2zt+KmUqc+KocZYgabZr/1Z7Nv93xKfnQgvOZjDfac/W2u+E8PQbvq46dPdfaoYSa394rXvYQ1ZHtgSdm4mfIGIWgU7bIebGzyq8xcoKQuUsSj9rVuNiHmWXUew== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:08 +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; Sun, 12 Sep 2021 10:54:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fW6l6b+UyoujXCEKcmtXaeGpsPl4YXn5] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af4a6cd8-c485-460c-615e-08d975dba581 X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zsWQCNgn1ftVnsTBpAhjycU5SjfKPKw1FTXq9f9Ghjw+/bpFkca6V3q1LOSkFot9o/OfjSeDbsQzVOd3P3bJNfpPzMtlPHoZNOVGoeNBGSR0bquh2kmRiZ2srgJ/XgAQSVfhwY8PFSfAdB4GSc99Vyb9ICfJ3rOgLDNUBXsXr0XDFPBdCwYUDdrBwBP98SiWyH35W1pngpt1+phoRmnJZ6KOsaH6a2Vse7eylqfxpLJ+YNrCJm2wirr4MB1EZlR3WTDv9rXck2ruiu6OcXmFjYtGmWw2i5rd0ZxkYqFTA8g2eOEj29//cuPbzzClz5/pAXYaVdA9ztYV2GPj/4t89mioLNOXMxTfm9iujrPlAv/hG7Qrd7JZelgMtXHOeBQRS/sus7I8AF4OZbGAkCXPuqQ5iMhRzAKGfccMPcYSo/PhAy3WcCOG5LWNFkUPp4wFzW6MKdDRSCervhYrtFL4VPkTkIE2wsrw8poUIvOL1KhJnSI/dejpJTCC5v1xLGfJUGlC6We2wsQUKyRKhZAaoG2H+MODZG6Gr/fMiwjSv7G3NjCZN+KklawZ+dkyKQM7/kzieSJmK3RtnNWyFqN0JJxaejHoxU0dcUgXMzF+h32bkD+yVXARbk/abd8kbTG3PKkDJyJb5D15a6xXQ1qmKxRrvrB9a37ovGPh+vLVAL0FQd4Chd75HedtWroWexC18crobVplSzgVn9m2D3Fn7GvY4PUCxy921 X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nK16tfQFOr4dvSWsc6MjSXfH86/xNIQKrjm8xg1g71wCQf1xan3389jc0iYFNc6qNno9uU83odMLeFI5czS/7nhBknhzcSEvAWJDx4Cw+BXzOzVs0+fI9Jop0lYNtA/T7M9wVqbPEGlc/Gn6knwrFiDocYV5THQkqI5GwmazRaXSEc8kAOwXIniYpeMICYuONsn++PEsOVJZ4HmkOCacI6G4PgGLnVP4JP1ncUXoI2upQnBjAQ8eYJ8uu+OarhEsQ1u8q2JGvivezhJ+pGoFkJnthp6kDWjwKVyvveOxdl74E2BvZfu/A3fV1ZsIiRb6N0bNzqROR6tWYwGOBLdALdjSkj+G0Cdov7WKp6QXUEVE2UsmIxCfJAD/3zfMT37OykR5o1PGMVCZUZGACyGCkdQMxIfgQLa5mkp4j84Zypkx6X928VsQsmpsphlnlvas X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Xm0RsPVsKh9qFL2f1k6bQaEpfhWF2dq50h6l8rXEQgYIa7Kj0Bj8j+DfzDBw5er8xwS68fmuYXds6UDIIpupeBUpLAp5hQtx407AsTWzvuHlJZLBKcWIlmJS9c11qrqoy3d6r5we+WdFK32OB9b7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: af4a6cd8-c485-460c-615e-08d975dba581 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:08.6743 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 26/38] avfilter/avfilter: Don't fail upon options for filter without AVClass 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: 2QVt31h6oLoD Commit 62549f9655c48f0ec061087fa33a96040ce01145 added a check to (the predecessor of) avfilter_init_str() to error out if options were provided to a filter without options (or rather, without private class). This was fine at the time, yet soon afterwards commit fdd93eabfb2644f541f7aac9943abce26776ea73 added a generic option for all AVFilterContexts and since then it is wrong to error out in case options have been provided to a filter without AVClass. To workaround this issue, several filters with timeline support added AVClasses and empty options; these will be removed in subsequent commits. Furthermore, the super2xsai filter supports slice threading, but no options and so has no AVClass, making it impossible to set the number of threads when using avfilter_init_str() (and therefore from the ffmpeg-tool). This is fixed by this commit, too. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 165ab1f44a..c76b74f214 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -922,12 +922,6 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) int ret = 0; if (args && *args) { - if (!filter->filter->priv_class) { - av_log(filter, AV_LOG_ERROR, "This filter does not take any " - "options, but options were provided: %s.\n", args); - return AVERROR(EINVAL); - } - ret = process_options(filter, &options, args); if (ret < 0) goto fail; From patchwork Sun Sep 12 10:53:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084422iov; Sun, 12 Sep 2021 03:54:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2ac0RmKFwJDpvtyIeA4VlUZDfav9bPlIdXEm6GROHUFF1URwSWAo01zl/jlAa6651XXcA X-Received: by 2002:a17:906:909:: with SMTP id i9mr6860961ejd.16.1631444091476; Sun, 12 Sep 2021 03:54:51 -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 c7si4584124ejc.779.2021.09.12.03.54.51; Sun, 12 Sep 2021 03:54: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=@outlook.com header.s=selector1 header.b=qIEm6Pc5; 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 B231968A94E; Sun, 12 Sep 2021 13:54:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2018.outbound.protection.outlook.com [40.92.91.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E41D68A64B for ; Sun, 12 Sep 2021 13:54:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tn7Yo6vDWCzASnnmVViJVkrkbTP6bbusehc0Z/otJc3FgYBK9AYJ7RIgN1xCsfVSEgBz7Urun0IUSi0z3W9h6ZF3N17GOocSk79azYIkt9isdN/gIJy2qiHg5ZBWg1eUUmxoIVGql+aQ3RNXrZ47y+Kj1ZH+YX0MfTq26hpb2tV07aLZXZxYJCyOHaPE0G10/0bGPgdl/XUttZcb8E/juWc1xnT4j/DWkj0X/DZD7zIBSUBmGI17aSgeYX/a166RqVA6h9Rx8cR9DDFrkJghEaV1UCLsuTpJ68xD1UAf0oJck/y2RnpnQviSS6sTEOzOSCO4Q+dNExmfzXSm5sKDxA== 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=q0BLRcmaXywF+Xb9IIp1cVVHSOkUodkedFa+B1KQTBY=; b=NkajJpnfNxiPQayusEoyjjrPDddN//aZZ7ULL76Yyo77Ut259m8Z1M3bNPxfbmZJnaWsKlGG5K4RSp0IbOAtm+H1hKDlgQ+w3u4pGIVfLRKxpBx+Uhbo4rc3S11Yn74+kRw7XAWyCyvqNXbCYa5xvf8S0yrZj/Gc0HrY84KcZf8vexMmmwkqTrQaxMa9XUYMXY4peqi2uLTO2berYhCGolnIrSsvhNqiYzohNlD6engiRrBrDzkDaRHf1clknxaefPTPJylYzkkNSAxd8QCNUDLwrDaEJvxqLe95vvFRH3ZmEChqUWCdJBpuFZEKfIpJk+w2hB772Nfc4xt04pwVSg== 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=q0BLRcmaXywF+Xb9IIp1cVVHSOkUodkedFa+B1KQTBY=; b=qIEm6Pc5vquqtqnQ6P1HBhArsvvwMnsx82j54fVFgne1yyhIGtHKKqQHjj2/hvPu80OrSylEa2Kv6JWk1CMr7zUBD+m7l18g+hlhNNpYo5kbQeVKRmHZX3cLlyGsUfIyps3tCVw/GPPHeUEKhvxwgs1CGellEnq+edZ2/ebiDyev7HkL6xHADvo3LWc0VskLQkO5GqG2qxbH6Ll+WjUhvpqINh1AqwrpFo1ICayRJjvVUPCk3Akw/JwzQtmCidodxMQxjbPfnJbzYqM6pKyRcKGwTzma3vVlgCEEXfjzhPGNgRUWS/Clw1ABgF5QGaTUMf86VKPu/un9/48F9ncNtg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:18 +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; Sun, 12 Sep 2021 10:54:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [0H6pW5cEYATu/n4881yIbjXFXJZmYOVf] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d88e9a79-e3b1-4cf8-f4a6-08d975dbab24 X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZI1hUghkFXj72G0nXFIU5uct3JAzgENJyjEVLNkbwCoMr16YjKJDFX+YS0+I2gmgFf0+7scptcpo1p0wUVOiNB/VlswQRrgH5zaF7x0/c/aCKrVDO2Q2M3LvFkboxRL2c5aifdjhpTv3jMu8omJvpeyp4BOlymJhoXfcAl5cLIF6nvFhuYi0lxHHw78/re9IXQ7emSl4DKLVkBMo4coaC+nXKh3chyMxXjuiplKt+Wg9xeSh5m68/BT9YlxSFf1uDm4vyuHV+Oo89mjUmh2Kn/GeEzal+p2Y1DBHSkZUSz6qhvJVkJ/Dpt4Zr75WJ/CgdGmvgz6o6QGrpfnODSzRgiByy8KlaobI21gXAKKvfmuQga9Gw8RZuD4gvu69zz9zqmH8jIJYyTcgF/1JaZ4R2dHtbPjN5wmEpOc7GkKKtg3tjw2IoJlYhNkzbqDI3YuzO0xqJ6ygn5z9kNPQhJec1LEYlob/8RubzSiKgiJHDygDBgNPllh8vosYDgxmBxwU+IWYIKR90JZEo8LesOo41sy1nMyZJUi+zyCSJxMreVuW5Yg8xRuND299a3CadSO0D+V3b5vbisS6PJ5ZJmKN9PZ3fu+O3KRosYEmde8uKlvB4Ba9xzwq6kPeCoxRaRwZvFSN6JUq06W1920RIfoyreyG+IM9HA4zpBzvDOqiP3rUsb0VY81V2qI1ITojjUpwabbFfUo+9/5QI= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: COUDWv7hD3zQj3Exgkgwi2FneregQvuNFe+KYyaOqd+wxypFBbV+wBUfIeMEm9ek57qvdayLxwe3phiLLfvK9OqyT2LGh1Y/+GkM7MLAu+420tmnJV3IcG+mKsJ40FRRWx1Bu2L0BW65Q1xJM+0V7r1vTgzCKlgYQhnGoiiiSc5X+s50SfTvvlY6hXvJjviRKEFSOiknUakgjJJ2L3bX99SHTKcFgxrAcd+YCQqz803j0TkDVXkmpBIS18NJ73gWjoXcFq3fESRvXFVOiAMhmxjItnTa+Dm3Qln/gBcbPJDwfnRrFFQ+JCFneYKAxEUmzVIfBDK1BcVX9tzaJcQVGLABrLwTbvmaqdggsdiLX1ezTg5Ut8iwd1DJmfz9N0PICWsGu8EV9Um3SOjMTEHNr0im4kLS5IqA6LU6FDkIiofl+qpI+C13H89IcCoJxKPf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sKwx2e1JuA12rvSP7L7EkVLGdyZtTnWWiyanB/JincGzBQ5CVENWoAlItsiVeEZToGF1I2EbY286jVrGeLoCy7eoi6WB2eN3n/7Ji/4ywRf1QK9spqCL1yYC1Ema2S5C2DLFy1FzBcuKrtfNYJuKPQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d88e9a79-e3b1-4cf8-f4a6-08d975dbab24 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:18.1439 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 27/38] avfilter/vf_vif: Remove empty options and AVClass 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: 23bbCH5WHcJ4 This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vif.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index da3069c1f6..13714d8673 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -28,7 +28,6 @@ #include #include "libavutil/avstring.h" -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "framesync.h" @@ -40,7 +39,6 @@ #define NUM_DATA_BUFS 13 typedef struct VIFContext { - const AVClass *class; FFFrameSync fs; const AVPixFmtDescriptor *desc; int width; @@ -57,14 +55,6 @@ typedef struct VIFContext { uint64_t nb_frames; } VIFContext; -#define OFFSET(x) offsetof(VIFContext, x) - -static const AVOption vif_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(vif); - static const uint8_t vif_filter1d_width1[4] = { 17, 9, 5, 3 }; static const float vif_filter1d_table[4][17] = @@ -643,7 +633,6 @@ const AVFilter ff_vf_vif = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(VIFContext), - .priv_class = &vif_class, .activate = activate, FILTER_INPUTS(vif_inputs), FILTER_OUTPUTS(vif_outputs), From patchwork Sun Sep 12 10:53:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084512iov; Sun, 12 Sep 2021 03:55:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXmcAIoWmwj+0Q26bs1dgxycToQbK/fJYiSIdSPcqajglyk3rUWYELwHDbGMMUzVYwKjuo X-Received: by 2002:a05:6402:28ad:: with SMTP id eg45mr5515737edb.226.1631444101575; Sun, 12 Sep 2021 03:55:01 -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 q12si1680550edh.51.2021.09.12.03.55.01; Sun, 12 Sep 2021 03:55:01 -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=h+8GEwAe; 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 A89AE68A995; Sun, 12 Sep 2021 13:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2096.outbound.protection.outlook.com [40.92.91.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B3F968A1AB for ; Sun, 12 Sep 2021 13:54:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kl/1xPNyv8eYQfCouGxtuYNzTimw2/JClfzsQwt9UDGovRyUgfCRL5gYymsVvSvZIIEvNW6kToVsS/6nSn8f0iRLdQC7wAJgV0F0K+dka1V9jOa7C/fBpzKWCDZhLPHPZRAwDZlZe2YayU2W1ttWeU1C4+mqiZV02P/CGvsUPulwUVX0od3by9BSRSd//9UClLCN2bLOwxN/32SAANVWGsmGzZt+QGbOYXbQUMnGO1h1Sbq8SBUtrkcHDKEDU8qlCh+U2UQqOMHecxM5jeKYlZYth45dLwU0gzqYwpBECAP7aLW+dWPGioQfsaHtY3TjCLpEBdr7BKnNOhrIfA9OYA== 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=YUPraIbGpdTBlZwARow7sS+Jtx1XQa3okAsdGVAw6nE=; b=OHAszQsdDRKizBhQFbBtB6kfPRGicrSNFNxOUEsMpiqNrsh97ormmvu15DkYjWpjfKLyfvOJTjWvHwC4kR7esWIctwDBnTkEVs9/yF4WDL92cFLiDL2Kwn8BEALoHSvsOBxdczjeCAZ7eFHqPBXhYke1ZoTag2uOhFalMf0lueg09+OCxqJ4VNWObVeqb2VVQrHZC2K/x7XDngwJDr17apH2TeyUQvSzvuQkfIDn4iu5/G0tZkl5yQrS5VswSt6wjJ4F5XuYNjxvEAFF8Hzr/txi/hb3zAIQ7LWDnLEpQ22gaV4Xi0vX+9lp/wJRMl4asw3mmzLUGTwHZrxAKbG5cA== 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=YUPraIbGpdTBlZwARow7sS+Jtx1XQa3okAsdGVAw6nE=; b=h+8GEwAeeW4mpv3tTOD6LrgZEb5kbBGpTBxDH78T9L4vVg2lFE2AV432ynTGrcI0p+Bk65AfIy2SNc5Cur7pAYRtTw7PIpUfvabEL4H51X6PeghWZKlxd+3tXPQ6mqDGBwLGLlYPJGzze7JuZcQCBgBSiDgg84O9DU543pzFtXJmdKpojFi5ZwJLIwdGf2bNxERURxeuAo4UbV9uIeWBGk8OLNTeiRyirsuJONvdtmLPISdeqJCEKOc99woU0MMnYxKhZTbGP5Losf/kb6IoFqVJHPq2YTLF43l8VJDuKamsU6B/9NskUkLI37MBb/2ZhTCcAQWEDnN6cxXRgylJww== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:32 +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; Sun, 12 Sep 2021 10:54:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [PFci/fXwTZne9G7nxDn1riYrYU4qXdvr] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65d4ba33-7f13-47f1-17f6-08d975dbb3ac X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zmfJ22Lx1e5VwP/KD0feIZQOHpVw8BeQMHK9ljRtLjChycI25F6FyDjUkUj7DtBIT6aJoJ6sS3zC3FWg79/1WAn2uZHpBIIip0PsExMkoqQTvhcTOwZ2hyWed5t+YEfBeYVFo2bOebtWIYsWg975QUIU0tkH1mZbVb8Q9MWqrPTSBKkku2pc9v15d1fNxqAeEY4vg+bCNgeyuIEWfG/nUkUKr1vmKfV6n7BuIQkLf01N29rBFedmf7TixEmLIB6A+x1cXb8TZOs5SnDV2zsrV1chDPOX2znexOb60Nm2wRccNxA4d3fMeSpIyubs1n8cpfskEBvQhe0T90DNVeWuY0GJdUbu62IcQ7JYjIcqIZf+DhuEyx0HVdyBAOmFJSWORHyWrkl6OP13ajaGBfl2wHxS0GrdJu+n06MhQurr1XMoMMfuZAW2Kf2zEeRyZpKLo/eV9XFf+Z+VpJ6H4ZVlGPq87XcqJ5OXS+07ZhP/QImYasyfjuXBYtvKYqhRjJiA5NG5HoY8ubSe+dSxe5aBRvx50ldZRUFO1j/q93+ZeYmvwYC2It1AAkHbp5PYooV4xv2xObn29cmiKSz8JFef5Q4/dmPh8rgXkUk+E7zSPkAgJHfDGj7BzqRMBF94Fp74yeYVjoH+4rFHr90R64CHlsOS7dYSRw0K0DCztEEVMqtXm8hQbwWhb0BLFPIsdl/brAqhyJStRBKfy+yJM9eVTA0VN6eFkpXzO X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1xJeezrmj3TZGePLhmY2AGqmjrgm9YEES5g37KhVzBOKaw1iJ3k4smHAxseiF8bNSdpTggCB5Yv3YV5J1CqwZqUYkEzu5NXxy62OntSlsrWeDs6azgkluE42eNmqHFD6oJH0dGeXx0iTUpmAxih7CmAT9UAXMFkj0QOrYLFXVDapaJhqCZnE/OtuN6P3kEuTbZ/KxS2gVYciC2z6BKMFpAggUDjsNXA7sVjB/tdm6kHLQEoFR++N3MBT2AL8b2JrHLTMjk5sZmSt2oRQCO6fMlnN/Lm/illleVqwsGxJoxvL9Fi5xnn5TbCj/qWOyDZ+EjjTnlxGeBAvyqXlUbUFJ5617BG0KdQusWPKYmzWNySdbHzFtvRwf/mhJNlc81iz4OT2Pah4GVfArhFdiABojOqGcNiMx2wQ4Mm2KPpJN8M16JXzqVC+NC8JVva+2H0z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZK38f+R906i3JKzZYyDyNu5ettceFsUlPXefsYyiHOiRMzPLXeRi3zt09X0ETYrsDQMOBc1z8H4SVbkNF9b7ck+/WOwO9N/eqRV1KzGLAH/cplvuEhjc2CyZog7ebLMlct3vV11ybzIlkJBTLxLABw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65d4ba33-7f13-47f1-17f6-08d975dbb3ac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:32.4444 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 28/38] avfilter/vf_swapuv: Remove empty options and AVClass 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: q/FWIBoM+uKX This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_swapuv.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 0c285e547c..8c323873c3 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -23,24 +23,12 @@ * swap UV filter */ -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/version.h" #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" -typedef struct SwapUVContext { - const AVClass *class; -} SwapUVContext; - -static const AVOption swapuv_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(swapuv); - static void do_swap(AVFrame *frame) { FFSWAP(uint8_t*, frame->data[1], frame->data[2]); @@ -113,8 +101,6 @@ const AVFilter ff_vf_swapuv = { .name = "swapuv", .description = NULL_IF_CONFIG_SMALL("Swap U and V components."), .query_formats = query_formats, - .priv_size = sizeof(SwapUVContext), - .priv_class = &swapuv_class, FILTER_INPUTS(swapuv_inputs), FILTER_OUTPUTS(swapuv_outputs), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, From patchwork Sun Sep 12 10:53:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084593iov; Sun, 12 Sep 2021 03:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpFpq1IoxY/jJQsFJEsy2IiOzqb9u9+EZ75K0XR9kAdEiFDR4y2KhiFwItP1lD7lVz+uoY X-Received: by 2002:a17:906:180a:: with SMTP id v10mr7069435eje.112.1631444110920; Sun, 12 Sep 2021 03:55:10 -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 g16si4643504ejm.150.2021.09.12.03.55.10; Sun, 12 Sep 2021 03:55:10 -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=fsQP5aFS; 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 AF21868A480; Sun, 12 Sep 2021 13:54:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2042.outbound.protection.outlook.com [40.92.91.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4DAF68A957 for ; Sun, 12 Sep 2021 13:54:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AI+BuHhqEHkzCMuEOQWOASVQpYJ7/oumEGpqjeYLK0BAnpFJ5RLijcNS8EsDFoHC4ewZFxdIwAldQTzm3SVUUO3HkvX6IHpd3JUJ/vyw1XvTuNLqxuZNiagbjGmlS5FYrY/1VhtfNsNqOtPA5WlNFwk8n5Oh/9YRXg52Ikuw9q5/deS08u2kKAY7SEBiZYv4xbcUSpqY9JI113wSt/yaw0Rupqeabqgnfc74AG9xrti5ebg63DRN+ZDmJyPCnHulgg16I6Wj0eXCXMlYtGSFfhT75RPhkd0S4xUgAG564nnFNC2bBQxfMQ63Lsv/TF/YqzFC+HldZGhpjbqEqKN88Q== 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=rdntWzHk0FHaMZm+/gzb1PwSPw2vuq/fBO68etmZJlk=; b=JtaSESJqhLiByHfe4VhC4kN5wWhfGSzCOV2KE7ilf+txWtIPA3KRz5CFVwp5474ooFMbLJJLFj68pvds33FMHkeynKWga2J3niDH/jKR7KnZz/nkjLaVT75geamOHlzp1JMwMpl7741fJN3XwxS7jt2YubvqiSCtIDyeAzz8HaJ64TkdH1/fxhVDPR6Im/wFiRXXqXD0/5MMsKnj/AgvtLHDUfaFOaAdTqLNYqgUYK/+HThnRcr3ArYsu73ErZ2hc+MhYhf2UwmurT3/kzvsCAv0HYtpdWLrr8PUeQ7dn/ZcteDvyVQ2nhhWUbmMmmEoBwnKJ6Yq5kv2ikXzxxwblA== 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=rdntWzHk0FHaMZm+/gzb1PwSPw2vuq/fBO68etmZJlk=; b=fsQP5aFSWukxWDMuneFN4rpyFHrgXiGcgIwruanZZe2LfadQsQlf64tUyjypeoszKoFmm28OLoVikVvoGAmuHos3F7OVZn+8oykV0OdqTNSXD6mznXSYYW9Ay9EBTvEZJ4uQLvjE6KLeZht7Wzjh5UKhMOgH8Q/zRA5SYX3OM6zV8cyMTmw9vZIvsz8QVdrIQd6hvVlCnMZxsYeOBvt8le8cz7603DqPRtgwoZXHWnJGuPQ5Bg4KwUrFCY2BaSkv5MIxgpp2mM+IKP27UdCGyTd5uQa1aRFuxBt39KTKAT1lR4GWWZX3+7JaIIFF4SsaeT26S80VnQEwThdtLTOzng== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:35 +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; Sun, 12 Sep 2021 10:54:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [bmRAektZYFC7iHKPnX1PZX7FT8oTNM6X] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9525574-37ca-441a-8d52-08d975dbb592 X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZI2kJ6eyUh+ArIfNJOVA+eunm1QOY2FsJD4OTxoAXQiSCnojkMtlli1A1rnONI1R5d68GPcoBjkHF991WHN2/Hmi2tGUCds8RKpyNZvyY5rQGsR29cGYDQT6UstbZnl5iGoID5sYMwr+xRtP5FNPQN4mw1NtevvGLGul2sqbtF+lLLZoLPMF8Qm470e4Lg6RrE0YWnkSZgHn6H5Mb86JAf+4pz20NP6EVkDJuCQAIvyaxwkZxK+QY6UEpd7heO/L3UyDxHCe6RfpYMg1/uVgnDlbtcOI8qSA3ojxk+PaQ1Md4Adf8P3ROJohAWvPoMzRGQEhv+okYSVaQB8wZ+8NfEPaOUvk+J5Pwg9FpyVk5NAh7ILNUUej82ISgdWETUMhuhCRcDKR87B4G1RF//Bu7YXG4nP9YKLq9iCXNrLrGwRQrYC4bIsm8km57zKDdRpP1nROFr2sxQG/FMPCHM0//49AcgoxJv71Y23WLFBItRQdgmy1kCh5iilp8ugHtpmzmlXVVYUUInuzsPTWvbZhieR5V7XCuGc8NdujbYVlLQEMgJYEMmSO1CsYSmh3NWXdzsYAK28DmSBBsfHXQlkjJUK+XpkgKuMpV8SWHLeWtVeqVvqL2WABUN29ibD+SYib0sSpfx1QDyiCc2rAdFBtSXLUBotyBJ4i09ntmvwBh9V0VM7882mxPFfDq463HSX3OXxOrmtV2sKHg= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yE515RvkamwR1weaLwrWgVIzpggKmqame2Y6H+VjZsBEoceVCYWYl40RZLlpRfAGXqCYFCP+ejvzASDM7AyrFons+jSNQ8hEGgI2eadCsXxJW0o2ZlOIrxguxVub0nFWvb5rpja8VIPHjzB5tIDxhILydgTrEiy5F8kQ6ND+yW9NzKA5rV3d+0YkUsl7yMSxyOzhTzR+pgd5SlKFLIr8S3FFp0oSRARMkoHlxU6xmUz+dwN8aHkiCJKX7EpmRqa6L5bqZ+oG3CoCLgvP5xTl7pveqbwqUTOrjn7Q2uP1idWd39cjuEv/5GeJ5bzM1SIrkjmjw4MDrxkQhm73wks1hrh6tGmk0I2N3fZE1rVyd7msEZdWWmdfy4kDWW+FYxWcSkhrwkP0+Jae0v683Y7nc3RxOA+rHeMfTgS/gXhQX8EIndpEymsLgPuWZXGMIVnN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xs1mE/UtLFZOVtXZanEK8iiaDX8WsBESNbH1d6ZJvHNZZ2B/EzRw7snPbhO920ykhbHLqHqu0vEk/MftEACjGcVdXzSzrVTUUizu6a9unKG3TGrwsWVBCd0wYTltiUYKhSaF2acs+Ilk1rNAVd91qg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9525574-37ca-441a-8d52-08d975dbb592 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:35.6165 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 29/38] avfilter/vf_vflip: Remove empty options and AVClass 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: bXKVLr+BzfKD This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vflip.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index 0d624512f9..c447663c11 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -24,24 +24,16 @@ */ #include "libavutil/internal.h" -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" #include "video.h" typedef struct FlipContext { - const AVClass *class; int vsub; ///< vertical chroma subsampling int bayer; } FlipContext; -static const AVOption vflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(vflip); - static int config_input(AVFilterLink *link) { FlipContext *flip = link->dst->priv; @@ -146,7 +138,6 @@ const AVFilter ff_vf_vflip = { .name = "vflip", .description = NULL_IF_CONFIG_SMALL("Flip the input video vertically."), .priv_size = sizeof(FlipContext), - .priv_class = &vflip_class, FILTER_INPUTS(avfilter_vf_vflip_inputs), FILTER_OUTPUTS(avfilter_vf_vflip_outputs), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, From patchwork Sun Sep 12 10:53:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084661iov; Sun, 12 Sep 2021 03:55:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBuJgyZKttNi96kjCBAIo1hhcfYFn/qfyqyn2hxHoGPt9ytusGxWyODNTqiBMD8LjZy48R X-Received: by 2002:a17:906:8a46:: with SMTP id gx6mr6834520ejc.424.1631444120500; Sun, 12 Sep 2021 03:55:20 -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 d10si4186355ejo.371.2021.09.12.03.55.20; Sun, 12 Sep 2021 03:55:20 -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=tG2tQLPg; 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 C317668A9C8; Sun, 12 Sep 2021 13:54:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2033.outbound.protection.outlook.com [40.92.91.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C05868A9C1 for ; Sun, 12 Sep 2021 13:54:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxD+ZTgTt+qDL9yUkx/QOo4k5mjKreHSQftmaHrb3y95lrwgyAH2BwgBOHPKT3woMmvF1QBdMhwjpc5lokVm5OUaA4s/hZLZstszangVT1KHhsHtLo8vMzSSlx2wNfPbBd8hRmkNpt9D5/5E9S3gQ6kB4a4ViiJVAT5KM4BCuyGwgSuFALDOoC2p2sT7dTkJLJIj7KyAvIcWSlILrvBhT/npLYrg+5ZJzqWcTGG8HOHF2E2dg/v/Cdon2vRyeUyVjZSluK51Tye2XqmNbfoYNNT01cvNXhP8Uh3+4dGsAWw9fHMTcIHj0yfhemN94LBhhqPqgPVKBSx2UscnETFXmA== 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=oCJuC7APwnZEwtsg2G1xUrgAhXQEpXus/xmSIGrDcvw=; b=CCXbq/QOehJAjdkMB3Noa+xFztpoP/lpLfAQEDOdjmD9+Vc1IpfoBR3urq3CfsTSxv4qaFdI4FAxlmG8lwWOhOCJFQpg+1K5wRzsXwCk52zPf02VTiwyMhBoJ8XosRvExqLkQio4nNlxobDvXcb7ykC4cWrYZXNelBZScEak1WXFcerBj2EruddLxhNyBACipFfDIkiA7VVhBtzAT1GM9rv5FTnchI66KriSM00auYQWA5SfYPOdDDorakj5bly5CbaZxrvhKvTrRjvTNn4s6k8yz0yqgsWLMzGZ3vQxdkXvVXW0IhmkfLMT2R+NsU7zuSI5buiKd3Zr6zPu+AAn1g== 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=oCJuC7APwnZEwtsg2G1xUrgAhXQEpXus/xmSIGrDcvw=; b=tG2tQLPgNDHCfZ6W6ED7V+Ch6w7PZFYTTpEK96zPkhVDU54jUXldN477Swm8aXdxPIg+Mb6gmnHVSeTVYCRUFbkI/jt+sIHsA3w3CG4RGgCAf+CiuesEIml3i5y/fyq5ZZA6snboiYZ00qSuVxlNFj2eNsZjlP7PFpMFl/t2TfzRH7zkjCFMIo8uTjCal8s7Dff5e5H7PGnQorwFTdtBGr58iF9q18GlBpqTjsmQr/+47rHS4ikdc+l8azq43Maj7vmDGH/1UBvgop5zs3m/XZgS94+V/1YeT8hWTNhNHa3V1gTxW0PD3crwPYckxUaJSb4wr3l0jawtNkNdLB99Ig== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:43 +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; Sun, 12 Sep 2021 10:54:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+Yy73P2bZa8Fk+4+CwX+heuQsjmRTpi8] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14676a92-66ed-4197-2ada-08d975dbba09 X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZI2kJ6eyUh+ArIfNJOVA+eunm1QOY2FsJD4OTxoAXQiSCnojkMtlli1A1rnONI1R5d68GPcoBjkHEs/7Uq7lSvl4NWN9UHYRsHkye5DB8NKL+lt4+5cKdu9F9JG+j52SgT4wXrt6ZvOCcQsB5oC5OTszGdXk0FpnoC2bMtZOjl99YFD8wo6jIaN/hbj2oDzwlr9Es7mlyoMKJvSMPn8xM3wp+XY9MfNgarGgRdPKDHFn1YNQcZK4ZN+SpCWwVM+Pyz1cnwP6sGSWCnpGzNJ9oi37/s7AYJ/Wy8CoxK+9Q3XFfHbnf724gctxYCCCbBedHZOdo+2RRz+DP8dgXVzRpEX+NlLfV+8QJbNR51QEBi5X9lLlVXMEVKaN73Fg4Ec0uCkEWr5Q28fTq5ioNpQCURKHr07gf4Mh4Tiw3go3NygX+PwfcmonCiMlXLF5PF0hNeInkbR8rBNOL1+VRpPEAg8RDqtp8jJonJ93/sazl2+Ze2cIftcYuvow3ZIt/g3vHu6OwVTHT3Qd07tQAsctrTfKAUBCMFhqhSoDrlVNalxaeRR+Q9PlSmz2261YXOCJtVbqG0cfAk/YeoqFcanfZoHnG9hFQ6cp7doOd7LmiO9PDfz05fzFg44Dv4ahq0XULuReZ29HQsPb4YgHublcSsR+xATkD2GA74hnGekIsGJ2OXJFRSHKSoGUawYJDDo/SjLcUvtPsASDU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3+6o85SXibarRfV4uYJ4PQUE5OjzHs8PO2tEuoJic1wO6r0chd2VamJReqNUgKz+Wlo9hDtCE5Tzx9u12yQSu+GaSr1xOd+S8ds5vIlDYM2NlsiN94qpZ/wrwpaHUOcv6qgBitYUq5KnGL3iaMtxq4PpF8z/H/G3dwouBCQTh1Fzw9Qu9RrYfuDln5EkPZc6nVS006CJu42o6J56avw690de3AeYMpSjE1B7LLFA3qHX8TEXapFL+W6m0hJPNBW7AZo1Lfxg1OKroq1sovKDMvLG8cfHc+P/UVab8WvFw0jZpAOh92ko74pHmSMMDCIbgrp7JppDDW/cqNzpeXUSB5wp/mZSI5aG1t59sTZbvjeBml2lSAGBIdOjsyOF+zGJkO6Arr46NqaVR02IrFwJ8DCi0xhE8H95kIRrUEOkre2Sv1JDlSSKDEl+Z1N46DzO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uIU8NNnnsKltbjJRDWqQdcfd5zkmMs/WZdWK5+ihZHSGi7vyyeogRy/NIjJbSHQ65y+No4IMvbxaWVgWHRV3jiESAB7aQ1IxM9KKAXCY16euc2pgTHLQ7/s/MwdsVD7hxuJlIY2xWiq9xOfh8NmczQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14676a92-66ed-4197-2ada-08d975dbba09 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:43.2242 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 30/38] avfilter/vf_hflip: Remove empty options and AVClass 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: nj4grEKuPL3c This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/hflip.h | 1 - libavfilter/vf_hflip.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h index a40b98470b..956eb982a1 100644 --- a/libavfilter/hflip.h +++ b/libavfilter/hflip.h @@ -25,7 +25,6 @@ #include "avfilter.h" typedef struct FlipContext { - const AVClass *class; int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes int bayer_plus1; ///< 1 .. not a Bayer input format, 2 .. Bayer input format int planewidth[4]; ///< width of each plane diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 7b5650a821..bdff052b45 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -26,7 +26,6 @@ #include -#include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" #include "hflip.h" @@ -37,12 +36,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" -static const AVOption hflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(hflip); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; @@ -248,7 +241,6 @@ const AVFilter ff_vf_hflip = { .name = "hflip", .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."), .priv_size = sizeof(FlipContext), - .priv_class = &hflip_class, .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_hflip_inputs), FILTER_OUTPUTS(avfilter_vf_hflip_outputs), From patchwork Sun Sep 12 10:53:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084719iov; Sun, 12 Sep 2021 03:55:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxk9Yc1FVVUlQ0lqiTC7OumWcyY5aoQaLqHksmcXpQNfBECSXxyRbtBpk4PQYzVOe2R+T0h X-Received: by 2002:a17:906:4ecf:: with SMTP id i15mr5891462ejv.250.1631444130434; Sun, 12 Sep 2021 03:55:30 -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 bd14si4113115edb.36.2021.09.12.03.55.30; Sun, 12 Sep 2021 03:55:30 -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="lAsWXbC/"; 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 E827068A9CC; Sun, 12 Sep 2021 13:54:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2029.outbound.protection.outlook.com [40.92.91.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 753E268A9B3 for ; Sun, 12 Sep 2021 13:54:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ieFUqE1wlfQGpmHezM+6t3n7oAFVoNhXrc8k69kBFef0ORQPqHku62u59/fz+YrNDlBQIczWjhxC2FX1cnS+whDdX1B8dpJ8skKRXbfsI8L7sQnhetSBlmk1hocOLhuYJkhWS1aZ9QgUE34QwqHh6+BerfFN51xFG/sdE23PBJ560FDSYTTHCc3vb7pFdmnjQ97TXUCOyaOjDo98Yx1VWa02BXEtDKXccycA8kNCgck6inLAIRJVVcjSCTj46uvmOSNskRtZmZJV6LlosLAgvgB6CI84Q/5pKGvlwO6upt2KdG+J45amNLzNkA0Vj1B+nsXdSAV/IoQMuBC9AX0g1w== 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=Uf7f8FLE1tAG/5CZYWcLNAt02o7aXX1FnzgROisDr/o=; b=Fw+WlntmGkvqYv1+pt0kaF5vt7vSAIar+xpSsuquMM0wRQyBwdgc9SDcqD64SO56IdZ+bjqcY+lnxM5uOOho7PeJ4R7DiXUCJ0WUzlZa9gXKs3bbyZPbgtxJIwsbfa5WoyZoPrV827qP5j4vK3aLr9oIYC6t9K9OA9GymbdSIWFJvGISPyONL11egg1AmwqPsJBO/VQfNh//f+EGpHSHx6Z6a7BYZNcumBB6uDurtOmSp/N1TbpIFXr/nVcB66Oq0hboWgYOWF0Nwvre+bfOSow+UFYi8SvdCgTgbUwTHIaI2jeG5KVTbfkmLIIuu0JS0F/AivtCYXAneqX8RcLEPg== 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=Uf7f8FLE1tAG/5CZYWcLNAt02o7aXX1FnzgROisDr/o=; b=lAsWXbC/QC9H9mqa79PE6eZBp/Sds9ixrDvfr5ZNXzkqVUsLnuv+Bk00HNECsIHOUnU3PGC8yu0PwDOadGF2bbeB749pge43NTCTxLP/qYlt4XUfXejZuxPETqbGiTPTw5IWDDTKse0iPUNwpB7nEphkAhBqhCGPo+xzyuQ4ABZrR9ZxGvhOtgwzlZYMx0la0GaOZAVu6tViWzuXuRMa+36Fxu6LdFenrxwE/+5sqtf8d3Qc5WI6ovELsDHzLmUhdd6kQFRyW+hOif3/4I6mnOCFiolIIRN3nMOvw2bdZm4+X1vWhshsJfFiC2zITfJoNEG8e3YtyKIk8ndJQSy/eA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:46 +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; Sun, 12 Sep 2021 10:54:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Ihg5E1m8fBtaMNH1AARnGiWn/2l4xiq/] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dd3f4a4-29e2-4350-bf5d-08d975dbbc1c X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZIHW9hysx//uhWa5um8pNowSnCE+02ZNNUgaSkfQY7UfApdl1lILlf9d/11ufEHfCoWKn7aeCuwI+HU/CKGAwSJX2e5NqYb1Cl+kuxHnp15+LU4VjKtYKtOMrOKFWsN5Z2Z0BCLi7opu2ltIC7KErgGxuaxbwYgqS1cuFyjy/tHPoXTgDWLFBKET06PhB0fRkzYYGfYfgeVUOStP6LAosyd+DgxJvVW0tgtzliPIxGTFf+LlYiInvSRg2GRpJr9ExMrAiCPS6nMY1ExYxNpJWM9IVWigyOG1FtXWLmnEO8T1u4wIIPviYytUcmx6pgfI6PXWH2/UhrxJgvkMj7qjg3z4HkP1qZvsc5sw5qTLD06H2OCmz1OXyU73SMWnvUPyiMDR7bF7XrutS9Hv9UPyetY+683Z8Sc31zSe0lqTNTeRY9MdHg2R5uKzMikZx4q5vMYXLSewjls37DDRpajXxZgEPuKCTJE0L10MZMVW/V91nFkQWIAR02xjaklPeosKYavn1h6CVv3rkz1Ht/9b4rwdTili+uZapPLFjlXSZeBTTyYloJ1B/LJ3PEi/kB7DAVMg6BRB4C9rBooalT08ldTst2jSub6BBJGPL2jdzAE9zsIPshFTUX5/nLVhvcMWlWngKg/FZT/zRE7AQhAXkO0bYyTtCSRZdUNFTLd+HR6Y1fvPjjNZBPGRN7qfT824GBumxWJGlDYYY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 280QQAOjllFAr8tGG7vdTrxREFQM9eLxxgx8rVclggO3L5pim2Ptmg7NBETGoYY31h5/Jhqv7gUJ9K/l2/CdCDBcH5JwnC2KyamFt4V9iOJwXt3p7y5LSbuIsJRG/Ld2ZbbAS1kBR9lyj/G7KD1LsxXIcm+tXgRWnuYOFRrjG+bVsPuMhSMY9n8nZE9P7JKuEmr3FJFZdLXvyVrNsXERJ9ybAVvEKqHzNy/6XJJ0rDcPUtZ/jg9alIjR2WDSRRnrjra1yveKs1qyB6EG9dMBOH7g2tW+pKWKPVhmgh2JaQ6u1pktaVRxOjoX4XOv7VAqhl48N73WBiJgSuPXKxgP+66A74ylKuTcqYQMh+YUWi4TIlpt8tZDXmAZrPl9sRHwan3+ojCGRqVJ+foE22xHavrQnRo1gqhk+pWYOPjpHpNm+AXhd0FJAc49d4eNImcR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NlOs+2xNVBclujvmFjYWu7DOx+J9gvnxu+yWfwYs3h+Hq47YHKC6lBL1oCMOhcBopA5WQoAjF9UPp3rizTzi3WhiWRtTk8h/gvD2I31Icen00rCjVJ34ay6+b9MoXZFMcPO4FStLcH/QsCZVsqH2EA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd3f4a4-29e2-4350-bf5d-08d975dbbc1c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:46.5855 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 31/38] avfilter/vf_hflip: Don't call av_pix_fmt_desc_get() twice 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: yucBlb8GrNyg Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hflip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index bdff052b45..e15cf22f9e 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -39,10 +39,10 @@ static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; + const AVPixFmtDescriptor *desc; int fmt, ret; - for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + for (fmt = 0; desc = av_pix_fmt_desc_get(fmt); fmt++) { if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL || desc->flags & AV_PIX_FMT_FLAG_BITSTREAM || (desc->log2_chroma_w != desc->log2_chroma_h && From patchwork Sun Sep 12 10:53:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084800iov; Sun, 12 Sep 2021 03:55:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwc8dbKHa7LW7sr8+te0D0qlwJTbfuW1631b0X/Vs0+VANu4xEdgI7axXYddIKlP/sC+197 X-Received: by 2002:aa7:c80a:: with SMTP id a10mr7472932edt.174.1631444140824; Sun, 12 Sep 2021 03:55:40 -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 m8si4291407ejl.358.2021.09.12.03.55.40; Sun, 12 Sep 2021 03:55:40 -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=aC01jJxX; 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 EA86168AA3C; Sun, 12 Sep 2021 13:54:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2029.outbound.protection.outlook.com [40.92.91.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9834A68A9EA for ; Sun, 12 Sep 2021 13:54:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G3/vbAggGGaV3mpRihQ7Ysbl634j7L5tYxXOkTE0vjOxhKnYzQvpLrRCtDfRts1B2CVnfzXrx60ZDIuDn1wJG1MIWnixrSfrka6ucp99mFwdxx5TvTOtCl9GqIEPl4g7cFKhV5+xO1v8EMaNqAeDxDPo+uV33y2DbADdzQQDenZQ3nD74LvGLGrtcdfGei4fbmdSbKKgFNIJ2ecH+8wzdNiXDO3WLAhqdUidGRRRCV8Ja6iS04vZmqxta33KsvHdR82oCtORdBY6i90cqnJLwNHiqXSQ7MAzn6vgSgi6A06tyNfiRJ4Fiw74ZZRs2byh/AIZvebE9+nU/oMwY3jcjg== 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=DEf7J0HfCx/Dx5jyFa0bHwH4vNyjMCStsteZLC+QHpc=; b=VQC53lJl4IGHasz6wX3DxOHIAZKyMzgWmsoMA/PXGkMzJkrLJkDKZ7A4X9qRaTN1TZywnfhbjEaNWAXKN/wiDPGKsmHGHriNKMZf/yzYsGucw1zkeyIKlUeluCFqD566/6kccbHl8ceolq1NP2va7UY4OzzpS85R6hquLGYn9P376LHJV/e5eEbxDqbYIJi4eG9Thv+hnNMoCG8hFujxQ5XgHF/I1nVCdvrdyzFs1UTOeGANNLRt72zNyIsx4O1XwKfz+U5q6IESgIwY6Ns91Y0Aqn6zSDTFVsQ5f7bKr5Q0krWH/pHqYIULcNoGKTewQh7m/piro7sz2xP+7o5RGg== 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=DEf7J0HfCx/Dx5jyFa0bHwH4vNyjMCStsteZLC+QHpc=; b=aC01jJxXHSuDEYInpR1V3TyJxS2JmD+5RRoVyckJEWg2CPx8Y88GIxgySL3H2gj9rv2Y9ggCwtgbFNuRcfhTZpumb1R+psBF9eosAojCsT01f9HGlwPBs9Rk8E3oGj7dZlRHEvbXEWYez7ESPfokUh8wxgbSyNt9C5zZmuqyim/+BakMFCmhPXQyOpYSdsQz8koToVfPYxNnmlBILMthh4XoTXBYiUgixlaFLmsLvfmAzHst/iUO4+Sc35UoWolduZJUrPDYevxfoWD7lbHOove/1qCEftc0QPNNCM6YDY45T2iBaRL5kAtpEffo93WAvqGNXfduEXhD4TQJH3QOEg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:54:50 +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; Sun, 12 Sep 2021 10:54:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Nf+45cuimZMf0yWkrK0UrRrP9O+fyKUs] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:54:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7753a64c-6011-4c1e-2e38-08d975dbbea3 X-MS-Exchange-SLBlob-MailProps: vKxeIzzER/OoNofSaTKg7Jt3BsrGee2zQnRmQZxTslx0HlyvYc0gWYpmt3xvafjRLb3ij+71Ay/2OvFMXug7BiXQe4xkDP16HvMj3geWdSeMQEqcBSH5BQ9FfmfrWwY5xOmMkcuTmnvF9NGd4+YkUCNYBQzMR3dxVt4lPyCKKV1GQn5yBNnKYE+tWf+X1WGAv1BP/4m9deA8w4j/c+xNy+IAHv87Cej32vGMEu7BZ3iBEUiQsJHdHf+rz1sOWOYaJMrWxmAV7V1p0P23Td1DM7Uy0wSqHuiU+2ADoCUdYu2ajnzfkqleR4BzYhQFPmwecyseaUahyyLmm4/jWxyxV9x5c7s6Dj/P981GJm2QK89blSWHKuXmed9z7rsMXOpkIsRvYlebd8s28UlJp5uUzrNvoeIHwyeWqesKcJd854X+qgHdtxZdiMeaFHnnMg+8M1yJSTczsucp4W/qoa7kF9v6ZxKOqIsHhsd5Wtl/jaNsBnILdsHTL0BwxAUMa97e713eiQLRKYEFiowI0tDVTb08X8esq0DG2l9lpYgACcAm/yqSMKR7Xigzue9pEbwXApAnV1VVP0dzj9Sxnso0t/XLvqJFx7+se8+07EeAzBNQg4JF7qZnjpHDad6baEmPKnNRt1PfBhGo23uedDbbSgda0nDbniZZ8lsloLufEmvPTRxA6Dt4hNN5dXwnZJpVAhA99AIvCiA1pDPLi61sITZyI7v+SABHV6DkepLnszMoukKplwdwEFh5GJkNgnnC X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AeMY5PysWHzmDCGpTO9FTjBLbHMR6ipEIcBwj7/aYvZI3QBx5O3YMkV37DxCOf2MEvGi8B9xzSttus9mTcwsEjUsgfNEoN+n6j7kz5hinN0GyUcVPqnT7fZIufYHMKLNWGHDkG0s9NNcooCOpR+z2ZRFgwjuZdhl0VutTGMcNlgbxpgWYMgrDupzGBYEVRCNZ+a1zEgWbWAlKwI19NC2eGt6h8mwSHToJtz+Mg9jkQRiyM7M4+u8jXEFeHzO9ew5Tdm2Rx5b+Nb7lmKhB7c6q3chUQSb2C0MZK0VH0zKxQgQhbAaoDNsjbbIBdFSVyJdcthaiU5UhX/02J3DrmyQVleVPHlJjlk6Ld0luYmOxQF00lJu97vk0fCGD5omqQnMnOJE7z8mKwNb77QrYWbS/trwMgi4lO85GyUtR//bsMUiVswZUZfAjaPwED/TvBKS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dRdCp0lNZWGrlsNNt4rCUTbmZsRNGtXNP4pMzSuNbTXg/PpA0VNOZe3v/wQF4ZweS8FN/UDZfJnofKdYMFoe8dU9NbtgkWE/4Yb8Svds2b7xqRGd5OU68kS34u+OWQcl2XRXgKzeixOfLKtiUweSvw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7753a64c-6011-4c1e-2e38-08d975dbbea3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:54:50.8359 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 32/38] avfilter/vf_grayworld: Remove empty options and AVClass 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: 6Ya+vl9EiW31 This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_grayworld.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index fd424527e2..b6b39af677 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -26,7 +26,6 @@ */ #include "libavutil/imgutils.h" -#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" @@ -42,20 +41,11 @@ typedef struct ThreadData { } ThreadData; typedef struct GrayWorldContext { - const AVClass *class; float *tmpplab; int *line_count_pels; float *line_sum; } GrayWorldContext; -#define OFFSET(x) offsetof(GrayWorldContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_RUNTIME_PARAM -static const AVOption grayworld_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(grayworld); - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pix_fmts[] = { @@ -328,7 +318,6 @@ const AVFilter ff_vf_grayworld = { .name = "grayworld", .description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"), .priv_size = sizeof(GrayWorldContext), - .priv_class = &grayworld_class, .query_formats = query_formats, FILTER_INPUTS(grayworld_inputs), FILTER_OUTPUTS(grayworld_outputs),