From patchwork Thu Sep 30 13:40:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694476iob; Thu, 30 Sep 2021 06:55:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsvpE+XByy4YZjwHYUSnyOq28gH7qNUciW32F+HNdmwrLd2V1uLC5yhNuqlzHNlUj0Mq9y X-Received: by 2002:a05:6402:144d:: with SMTP id d13mr2814761edx.223.1633010128280; Thu, 30 Sep 2021 06:55:28 -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 k3si3518153ejk.475.2021.09.30.06.55.27; Thu, 30 Sep 2021 06:55:28 -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=AuDEifK6; 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 EBF0568AE6F; Thu, 30 Sep 2021 16:47:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064074.outbound.protection.outlook.com [40.92.64.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5B0B689F3A for ; Thu, 30 Sep 2021 16:46:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNhudP5LKin+mymMHv+DxtFV6j8WiEGW96e+p/wkcyfkzip+vGb8AVah5rZ4gKeQBY0eW6sC+h5a1Bbo9952VNYcAItKUzXtegMeJN4l07bnGzQthmdBWT2EFBsmAcIVN5esPVcgZciWZgEVBY87hugRohVsBNPzOpF+nNcwBsjmyZPEWu1SaWMKIOn6gzDmAghtWpvWoe3W/xEgYIF1T+gmriWXwY09MHBviCpH1CE76pEDuiKa/wSSZnQd6qTqf6rRouQtngKsRt+7mYzsUj/FDtQFQPuUwnI60YtXaOG9O6B1zMrAiPFcW+vI4nMZFopIn+q1+EcOZbDLNfVccQ== 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=nWN48eBePahCABnejANCHDGujs1cjuIP881LKTaLk3g=; b=d+Ttm63n/0YYG72LFLEJksEz+AblJNLhic3txjWGxeuuBKGRDbqFe2wnFY5Gr4ThzvdUUofzxJipNHDr4mBWrQzufuEyKTTgFoJyVUVfhSG5LyVzZzvV7y99g6bxmJdqCnuRFmCP/y1qkJKR15GjEKxNOwMFEm5404lpZ+LVyB3HeagBL6xDbkhXjuWKk5BlFfcENzqHKbDEx8jTNoW7BL/WekurVekVacadQvL1ol+5b5vKn6QPbzoSzufXG4ezZL/PDJrWYhsLfzGoQsF+xBhCZhBzGXZVhnblq//KiiLYlaMFF9SGoaWpnKqgZlBUIAqNXWyv5BBH+EsmPzjbBg== 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=nWN48eBePahCABnejANCHDGujs1cjuIP881LKTaLk3g=; b=AuDEifK6GlfMzkoKiqi+m/0j7oRH+IOQwwnfv+ts7qyPPFNgWtxRsrql2FeNL9AqFUeO8F/cEMbSkzeZd5qahmhi2d7RJbidbjmkqB18C6T/WNO2ila2PHg6PaLKv0nabewLbYhcm08HMMvIT4/5XC7RKDBgowFqVtjse5KSwWSAU4of6nDgO/krCffZTi8zbM7T+UaJqUgtFOaWuC82/MBXi8TkQHG3ghcKS0COBVG8SrEOmpnSZ9YZDCIQiAHqMpn/G10Jk9BqZYDRpaPnXZ7aGOM88Ll8OIkBrhwWTq/y8Eq7aPNKV1VJ3zPU4LMSu0Cf2373t9goqSbBZot7DQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) 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:46:56 +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:46:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:02 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tpAuEkj2O8tWffyQkNNp2Iz8tONhGLZN] 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-60-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:46:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38fdf808-4f75-4756-5552-08d98418c461 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5ROwqJpWn5xi1ixOLZTgQj7/CuU4JS2LyVHe/Lo7D0wcsdqTIuxHHj24O/FXnkWudnw+9H3Bo/JR23Rnq8KSp4ptIxa6zN+/Q5scW8mOqrNXGB/Y4AKCGFwVsXqWUurLifrixECtvjnl3Dq6uDjxzlEsdn00nkv0iEH43wsMclzGjdqKXiVdj3l4Pcw8aR7eGPxqxUK5XBkwJ5+qeYvz32FCY8OIFbyck8ocMQTshGqmEtXNaAiS6HVvx1qeMEeRMBtYlU5Odi7lM3RQvjl/XErFiDznVqXT7dGqSVLD9vq/tPRC9+8FXZYE8ibeHH5zbirfx3dw28dsLwAZQPjSmyzqzk4wnF0LsCWm3ZnAz3gzXAtCTLOYH6jqiycwlxYnf4Buh2F5YXWKQ0hrrRK90NuODjHGBYm89wgk5yrCGHEu2W+wdEhEnjAL/zXzy5+9fqJuAUooOsE08S9iaOfou1PtJwU4S8FOyWbWRrSxvQN3WWmCN7KpO11UdiY+zV15xI3TUsc3A9RLouxbzL3s2zP6TyndKstUl5xAGjDw8I2MQAJr0Uap07EltK/vO9t0jy9LiM/qvKlURPXBrz/LUWKbHs5HNCYttgUX0UDKw/hOsPmFf5r2+eRUYVQMxDxh9egCk8YSdAGtlZsThCb5GJ5zWTRULepo4O+YMB6GzmiqW8+creaOnC/3+HlkDd8YelmyivLCnmZRVO7sVzh3eKXaY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DwmWZnwTep6hg88qBjKUvWSvrFUDxCIfNZ4uE50wMdK/V3czl1B/W/LKouvhJYysG+qAQa7nZzgpUc3bPdq/vRZ9ogkQ1yM6hBl+Ms1lViJZd3hwtIML4xUuvwOGkF2xQBI0wDzV199F/5gVtDr+3zUdu8KaY0znfxPb7QHfr1oNBzshGK6xzAjfXmQuTB7pNWkVxpu7+9U7mWxvwyxtah0xaquOTaw8dLFNWLXn1k4wpL6PWSgMXgnC9OtmRXpFmtgXDCFjV6MBwH3YFxyT2J1vmyG4c5DiA85716t/7BHKkG2cmuU8phUCKliUWshBAWhM7TxivA6O5Dm/w1IBlrZnQOhNZeMAH3wkrGIVLFSKDstL9zSyfakLvwWGm+qO9AuVVdjuQdmx+lz27xJAQG7Tu0LKQ6kv5YKrIdFYPfOdN/cXgoh1xp0UJMBQOjPl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nscBmJWFZZi2WZo5UGXl2LQ9C4skrJClANRIPr0va1dHWkOjlO39wpfHU9L4nRG6T9MAINLz4n5r0hVm+8jbB+v2OCWBgOUkze9xKRR48zgRbgNNghetK2kO7aGSmKNgU8lT7bBKwFy8KVcwlmXOng== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38fdf808-4f75-4756-5552-08d98418c461 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:46:56.6753 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 061/218] avfilter/vf_colorkey: Use formats list instead of query func 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: UdZbDHOMx38+ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorkey.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index 93f2ae3ec9..6720be13d6 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -159,8 +159,6 @@ static av_cold int config_output(AVFilterLink *outlink) return 0; } -static av_cold int query_formats(AVFilterContext *avctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, @@ -169,9 +167,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(avctx, pixel_fmts); -} - static const AVFilterPad colorkey_inputs[] = { { .name = "default", @@ -211,7 +206,7 @@ const AVFilter ff_vf_colorkey = { .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -236,7 +231,7 @@ const AVFilter ff_vf_colorhold = { .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, };