From patchwork Thu Sep 30 13:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704951iob; Thu, 30 Sep 2021 07:06:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAXB1jnE0gYsh2QsSvO52CZ1j1mIVNXBMdFfzIjIsGn7u6cWwhBjjUJQ/kNah/SRyZxrYq X-Received: by 2002:a17:906:b10d:: with SMTP id u13mr7162793ejy.135.1633010780497; Thu, 30 Sep 2021 07:06: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 l7si3316145edk.342.2021.09.30.07.06.20; Thu, 30 Sep 2021 07:06: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=IPNH1XWH; 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 8098B68B00B; Thu, 30 Sep 2021 16:50:40 +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-vi1eur05olkn2044.outbound.protection.outlook.com [40.92.90.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 088F868AFF1 for ; Thu, 30 Sep 2021 16:50:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZQsQ+/mvyLBjyJWzOJhv3Z6WhGjs9iKN9lDloG8TeMVp8lMTF11dpeplrGz+ZwzFrlSeJIz+9XmFLZZC7/ryqQ5LVZeoWMq3ANUgQbPKLcUON5U6y4GL+K1I/35ScvLofoS1l2gvS6c30dWoz/GkM2v+5ncDYWPiEaxpbulFgnita9pBvBBXNK/PFUmDZz5AP0ExWRmtsYDpSXcnbPgzvQHLgGNXEoBb1rXCXd6Baf1YqpLl2FQ2dpnb5OdkDOD1tfysmUcRCHhTJx7swV4IKq9YNAhwXuUPgQiJDhWwf3CoSwy0hWHb2SCmI/l3TJRCv6RYsG4cR2bWA5pXUCaIA== 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=5/foj/987QeIvXK1nPMHN8anA9XC0Cm0iMqkDmJKaF8=; b=YrHKT4R6wHWezEvibS25UZphgr6aVfRe+PBlMgXDkV0WG3vyIWhO8fOqYe6Kkf6KwUhgpN3kWCbP/73xksuljC808NGoE+YUUK3N+ySyqzlyDaRmih1L406Y2hOitUB4gZBq0geXdCpZyERyuaL/c1PVkvITyJddjy2snR4JvEQucRAa8GFjDOKHNR24o850X7d96bC7kHFIvvQgnHeo30DjZ2K2bMOlccmCfnOiuRo5Jaweh27kLrzU7z8AtwBCHimjpV/bMKz8tle3u0sqr4ojOJMNGdHceBswUEIvKaP2un4o49ZYdbLWQWtFFXprFUXRJLt9AOONIFsMlm/JMQ== 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=5/foj/987QeIvXK1nPMHN8anA9XC0Cm0iMqkDmJKaF8=; b=IPNH1XWHLV47tgH2zhqH3D/sN3wJB9cJ4k3vGKw7Z1aTCaxGTyx28ODVJb4YpvFJsE5oYH7kC3ZmJ2ZECMnrY2YA6MywBFTyOc0bFpOFCG7ieuhV3gI6yUmzCaQGVL7CdfzTaVtK6nSJAD1LpdcYzC0T8vRe3+gePouY83vBU6p10qECZjdbvf6Xr4KGsgdj6Jifc3NN+R3hix6R/6DHxreSu40KHVfYt8NhR2cl3w0LrOIMUo0h24uN+EInt9lNmdLv/fnlxF0tT8+S/ppK/8VqGAat/L8kTofOQs6BaIFp+47I7KaxW+gK6TuTncZRkhmhO6gvh76RQwaQf6SHKQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:34 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:50:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5U9mTrcmV/b5cmE0qpsu0zDPpZ0md5/7] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-108-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:50:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f322284a-1255-43ee-2be7-08d984194647 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na+riQ7jMwwY6CFtBOm5ktvT2aghGLtsKfXJRcX+qBHXQSsgVY/23DvzLuxOyta2YmBrezlSK9Q227GnKSSxg4YAUGNBtM9G7CHnUDyl+as7VSK3NSyWpLmi7JJ0kZK+BW1Z1+Ss2Y/GinfRcbSpYAZ3gBL5GXt7n2DfDxsTf+M5/U1C2XPY7xv1SRo1A4+RHfNz2jlmmxcl6p0cBLzBM/Qhze071CLcbhYu5jlhFIuSW9gfZC5rHSBsrtTPWnfFRF1hbEncVK9Ca7rA3H5kia2QcR4laJqDKtpf9bwBFcjg2wnGUzDttwMKpQMABGNK9gHzyj0xklLR1SK2d5uI7gSBYW1lFm3EM3CVQ6e7HmWOEvI1Y3Vms9MLxcTXQoK3pfbCoKRWzDgIJF5WNrLyTE18ef5nH1BPIe1JdKbhpGhZjeh6Ybgn6J1dYOxJ6zgfREhOLA/dtSL+RNeiuaNE+id6a33nQBfmBBP7BmfHyU2Uj2cC2Tk0j4vn1LNKsYmOtdLxGMMGNF6pWqQqyBs+QmhQYljhWD/y+JIovqWZdEqP3s/PLdLDTzjcxeke0PAi9BrjIwgTcGiwVnqmjP/GnqCtfBR2C17pFwNFsesoEch9IVTRogJcGqACuWG24Mjzuhi7RfHOY4A/3bIOdaD6NYm7sbOLXGFEZb+uo35Ni8HA+dcUpFuxmNjFz1nGUgxRjo= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BBcKxpnvmA2ulaT5e9fpuUt0Unn42yP1HS9bbBcAiX0CohbETepAFJzd732pfQctyfJy92uQN2E4//7BVbJ+rkgQ43sYDPRhuqhUpBbX61kxGF6Njv8S3ZCfa8JuKzKWF/tl0kbBsS1rYtlXi5CmBYd0V5rlHUnp0/H5ZE/lbiKZGyrwbFnwL7hPBKdCDGAZ+ZfpfWI5y0TFtyndVJll5249sxKsGa1xLSW97BF36JDsSSCo2HWuiZwv4QsIhhd+ElelDvgLB8xtJDHJw1b07yULkhsEvJ/2UCc2h0NLZH6ATAKyAZ1MDQ7XBMUuseTVV12l8Jsh8fWyl8eEwwpBUfEDGTb5RLWiEmFbA15HeqxSax5gSvNYeDVVKenWq60u1owABz0nidcioCW1y5ppVQYXoA+wdFgKN1hjaE4gm9NQtzQtn3OGxDW4zJFJ3i5M X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SWRFpO/c9x/HRm6+x5943FBwyGl0/oxlO+09XaHJcNAwTz//L/2mzrQ1xpuZDkzt3GVLOGy6q69VhZIWp/Pr+MjLswLeDKo6z5XomunV9yYgGFX0Vw4MiKi6u5ujbaTq3Viqi4lI8UAEvxvCQY0GGg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f322284a-1255-43ee-2be7-08d984194647 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:50:34.0103 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 109/218] avfilter/vf_signature: Use formats list instead of query 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: VwO40+/E5pXr Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signature.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 03b53f9a4c..2b55f7fe67 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -69,8 +69,6 @@ static const AVOption signature_options[] = { AVFILTER_DEFINE_CLASS(signature); -static int query_formats(AVFilterContext *ctx) -{ /* all formats with a separate gray value */ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, @@ -84,9 +82,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -762,6 +757,6 @@ const AVFilter ff_vf_signature = { .uninit = uninit, FILTER_OUTPUTS(signature_outputs), .inputs = NULL, - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, };