From patchwork Thu Sep 30 13: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: 30779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703297iob; Thu, 30 Sep 2021 07:04:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg+5JYiSxq+hF5P+Dk4BOxmMJotE7NZYEvhbNNH8+CcEyzvx8wLbdtfqZpABfQRY2K4GJO X-Received: by 2002:a50:d8c7:: with SMTP id y7mr7430191edj.133.1633010686571; Thu, 30 Sep 2021 07:04: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 e2si5240979ejs.346.2021.09.30.07.04.46; Thu, 30 Sep 2021 07:04: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=B9xNf6d+; 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 232A268AFED; Thu, 30 Sep 2021 16:50:19 +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-vi1eur05olkn2107.outbound.protection.outlook.com [40.92.90.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC4AE68AFE7 for ; Thu, 30 Sep 2021 16:50:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iCLkbbLGeQQjXg+bAOl2GP5+4P41rL0XZOCPdwIGhTbeSb2iqsI8+VuL7/OA4wbiuFwBjUsOnxDDRJf2XYUXEBijfJlVo/JJoX95nNjoPzVTr3kFgGjzealCX7iL0W94BWKzczekhwkQWgtog4cJlypzWEX8WqBVREuDzHcbOfm4A62K6ueEXArj9+wZGW3P8JVC0rqr8DXnI7rmM9uDNnvJW5vlQ/azU5ky2wyHI5fVBMzFUCaRcHexuKrZDN8kdZpgjoO713ylXXKaSZCw/kvShTMXTkJ5QvLxjI7XR2kgHRkAcQRBMAPNeW6eo/Hw5vDPPgivZDAZUumfbUm7Wg== 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=P5aD4UrjX9RrscAOXejm84ccGNKFEYD+NzqqB1vi9Ao=; b=HnlsRyVmao9tP7UQdlbhCNSsMbiYfe/3jlk5OAtvZgBI2KbzZGzwYkvdwk8JgNOefCmJ/4fl8zOBdAX8yeBoG8n1q7vxAyx4QWsn54+chLVR81glzQRGWMaSLYUVNc9zE7GhuTq0Ws5nAUDvY+NrX2IehwAhQtefwJu3WuJDfdE7ds/9h+echpaZzeoPP0h8huZlf82WfCnIlt2DsWB+p47rirxR6FQNrFc4LBK9kynojKfrXbOxRA4oc9FwWJpzNd6cP0IsEEQSXn2N5rTUmwp2hVOhBIMtvn6EWtxd0tvpS1R/japjDpEem5oF9v4TyrR1IVIl3I3ZgdJ422Q1aA== 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=P5aD4UrjX9RrscAOXejm84ccGNKFEYD+NzqqB1vi9Ao=; b=B9xNf6d+hIjYrRsnn/JnD2nJIVmROinESE9+R4hQeMLwkWlWUj6sbzqak2/h9WdXkeqIja2vxad2xL96xY84t85H2dVcE4y8bRlHDbU9oU8o6aSuWMwumMVfwJ+wCoy+fOyYAWXmQ4QSBAhc1wDhmtIFPISRpoeyBaDhYMmyCVZRfejssgdnl2SkZcK5dhyjY+4tReCTPi4pvo7D89piS/gllqA3JhXaoQ3ML6LW8ahAHH/ClrCmhzNfecRDEdHqqvPCJpCyUaC3uRWz+CKYlmzNaxmnYPqsWViUl412ogS8gAv/EKYUytbI7xRNTsFAepRNQJyot8TkSAwZNi5QyA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6t5O6OYLCTnv4co1+lyWApL0707/zdRp] 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-101-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:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6348aa2-235b-4213-49c0-08d984193bdd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO5ghXaa2r3NLzR2q1nkjGJnNzNxO0Y+QE4QAVTqGO7M08MP35K772R238mFqoataS44DOAxHL55x6Ckz4pE7ya3UQ2voXiNQfqPg47EtENC9vKcJ3Q2LgyLnWBc/9hHJDwff+97DzQdwI2AeMpXEMsW7o1HMRoerNYyRNYo0taXSk7QJG0/w3fAlLc/mq49GM5hyywSYHU0ZTM2L72x2IFgGZRn9ksTo3PBiI4X5WZ25TMhbJ3IJ3M5rUvWMZQi65oFxTm3ikOptifcLi6ZQL6eZDkU0USRLkJwsCmTYjpvrnGiOeybX01rbDkXeNHaswdodDxSiaJAW2qkWxUwbj1Z13tUo6rHkJnBuNzdu0bDCyA9w1Hhj1DVGJdB1N8iVPcxVep+iffCT2QY3ORZi/1z9z0ZwhcXPxqPcM4xH8sGGhiem46R1Z1rVUqsf4XlAeBsU3oGYM+nJ2O6+usF0N6qLUZ2nJ0JwCYFBHQdhNIe0NsAT5i05uTFTi6bBiNdOuGfvKy/S4DVxC9JMRrBWFjR4hy6DS4QjZVNMyCjiJ6CVlB+bRZcUsWFj4P1z0BaTSni9Lbzbp/8MBJTxd/ndqCzXlmMaXjgohJ4vIDlfPOe0SYE7PXWtnf6VDq+wA/DA7pZCnHLfw2hqkaACmizDYWAGXgig3Cp4EYC8+oiVXlMMt28JCdcaHcifjHpcnPF74LQQN0chGFhoxmKvaiFZieg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cn6ufIiSh92iz6EIcdJv2Z2kivNAXMYZHrebDkaDmuzrSDh5/ImxLpR/bhm1qy0yaUGY5GwiABuX1LpnS62B+BCQABMCg3OXwyfizF9OvKp6iHtdohF3PVEMqIOnvTsRUtRvoaS0V10YTktmgK0s/sc/RXkcEZHdUBjTNDB1Nu518EyCUkZsHnMuv4FGg76y9Njr3OHryLbAEnjRZasnN+taiR7y3LeBfaYotnwUyoPxMWFJlI7bexBprUxD4YHLfkfwk85swk5mgZTNNaQxaLDKoB7Pb4D6pQWnbtB0P6fXJ3tMwuKPRNf0VIxHbI3L+G6l+RYWT861WwcSa162ndAS2poS5OOwOLpg/xysZZyo66axB5YvSheAWwvPr1G/rbL62gGz076DcaWKfWUBVH59HVY9/M33W8IJ2Q0NAtA0TKlGfvW7jtGaf8JH+ol0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fn9+eWP+a5gsoemvqfvYGOzVbeAgHE8YJYvXi0SvcQNhIiD0bTRMXeOVgVyU90LGZl/Ll7PFcA+yMvfASM3X3CL+Bf7K+z1ZYtmiypziQ4bFLKWUYAnX+4xUcAwrzZrLDBho5fRplNzuojoykgppwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6348aa2-235b-4213-49c0-08d984193bdd 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:16.5611 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 102/218] avfilter/vf_thumbnail: 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: K0UtKKQq4AW0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index 0d3de1afbf..b6d6814e5e 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -244,8 +244,6 @@ static int config_props(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, @@ -262,8 +260,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} static const AVFilterPad thumbnail_inputs[] = { { @@ -290,7 +286,7 @@ const AVFilter ff_vf_thumbnail = { .uninit = uninit, FILTER_INPUTS(thumbnail_inputs), FILTER_OUTPUTS(thumbnail_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &thumbnail_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };