From patchwork Thu Sep 30 13:40: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: 30783 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699197iob; Thu, 30 Sep 2021 07:00:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJsofemVNx+m/nbkwo4c9KLpw7O1VppgZvZ5iB+aAsofvZQL3UPOnQpgRxDC38yThvBzrD X-Received: by 2002:a05:6402:1d04:: with SMTP id dg4mr7281051edb.183.1633010453742; Thu, 30 Sep 2021 07:00:53 -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 q6si2821921edd.367.2021.09.30.07.00.53; Thu, 30 Sep 2021 07:00:53 -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=RBLrlxn9; 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 BC6BC68AF52; Thu, 30 Sep 2021 16:49:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4414568AF2E for ; Thu, 30 Sep 2021 16:48:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L9ywLdYcBCJ7op+z225Kc3CPtg63nggCJAu96agsr8nYLsi7WCrDnjnVZSUl6ppT88YKgKHOYHaaOUHgHDXgq25k5pA6eyROyHFnfPaW4pwhRD4IcOhHypd77A8EQOPwgDj+NLOK/adUzOwWk9pN9/gPjp40MXB+pl7jm8QbhsH6S1disG2InQYrP7Tx01oGeLTUmcwIzo7PluubfIQ+pNIN0khkiPFGrOJ9zjweqCJJvFBUOmEHdLbpBDi/7fC3baldA1RwrldlKLpFkkMY88j8SWxmtmTMXBzRwkHO2K2Bi8huVz/JMA19ILGw0rEJqcWByMpYy3BV9AjaHi9iwQ== 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=/qJwifZVpyUFg16HxsBWCAuZYJ8xYXTW2W3r0YGbzzg=; b=R4/QcMXu4Goerw/UKK4fjwuqEtMdW+hg/klG2Nkwn68gISoV9Uxhn67cO716cErFTW8QGtCctFtUQe+7ZI+oz9X014ZmsJJfFx4cuXB3YeXAWQvF1eDQqwijvxmim3dov5kc8HTyMsWl5CoS2HV0Hp/IghjvSEE3rnAMee84CnkGPWiCSg0QLpQkUAyqeGauvZQhrUJcUUXU2/V2iCtzEYoW0cWM3r/2gY+p8NQd6cc53C5KyaEpbKNlktQk3o61Xd9b9BZlcy7xhEpB5/Su5J3ug81X+jASaUzeQNpxLErq9nXEEl1L0U/YxF+ucBlTX5k3ZPd071UKZPups+HVUg== 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=/qJwifZVpyUFg16HxsBWCAuZYJ8xYXTW2W3r0YGbzzg=; b=RBLrlxn9T3sQvoJrprrPRrSXMHakUwNJmIro+3gsA9/KZ6QQ53sgcECdAef3AIdhOpvmpW86q0etk1K4e7xVu9FXNQXaFZRy/LvdbwNBDAwOcqdBEHzKw1MSnL3NgMCy7nhZY07H2RiTgFXJZ9ZjZKdfSl4qiirMACaM+cqq9bdxOiqWaODAta35T+y9HFK8ZFOnrOZXWU0IzPgQ4kqaW/Vn6WkIUKWP41k33y46Xx2vrFV42Epdi7wLelAsu+B/17WiTn3vnCXHAudGAnpUN6Y31VJ393rEC15X5i+rM61fJZLgKhfDahhvJI2i9lktw3Jd3VJMbEN5/WaJVVzCpQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) 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:48:54 +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:48:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qfn0dAL/yFv6jUzDjVHcKkjyxzAdZtfq] 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-84-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:48:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8aebf25-b204-49b9-2ea7-08d984190aa9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENwp6xTyaJPLWpADTJwfHoF/ReCcRVlQP/URZT8dMQnKDrzZIDMbAyuKWNuIGGX0WvbAGeG8uvL8cdgF1fW2aqVhKeFQl6xZX6130S+LdfstRyZHU5VEUULMaQbMM/7gM8eF0LCgtIK4La2bjmuKphPhI7y7wqHUXgrLGR+LmQA+N/d+vJiLkHPQWo0vOeYWsmbTT09M2d3dnpMPF2Sd69kk/Ty1QTx+BpMUIZ2UoU+sgPzF1RPBcWZoYoknw2/Rok3aHXLWD4kqbNguVLDt7o2Xj4nErbjnNlB+Q/sAJIllIK3RBXb3Z9A44Ic8NFaJ270EHcSRL8dE0AGY6HvKF+3dUXX279v85Z2JjlFSIEX7c+pv4tca75PdXkmSbxZEYKpUj/Mkt+Kb4Pk+80m9B/laMnL6uWr9Of/Eb/YQnsv1A/CBqDyo3/FKfiTAEhscuZCyVW6W8gXMeePHwYSHn/sAHmIvelckfdMUlSMsXwRozU+hHGJndqHdv0x22CPlk+ue6DIl4wTx7/bUcpwnTAj76N3xUZV8DBn4SUYzV+5Z+op1oDkkAumYkI/n63R0JdzKfLhDyxlCHf16VPJNoqv8rHAjZgaXcunge8NpqDb6pTqkTSb9Wv+63Jxr947PBwy+tX2ppqXy+KNLd6gmhZinN+XdI2wg2oPgyikm2VeryPP36QOmWKSM3vKCYn4bvqqOqyoytMMCk8iZ/CaT1Zk= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ha0nW0Epx3+g1/rMnx2C71USvTA+Tx+/4F6/YlgUZ2fdMe8my20G3gkuWKXPbI6q+fxXBoFVA16Pkn4eZeIbDvSeL2GHyCSV6vAOoJF4brGvraPkHjyFvj6uqTte5+1WbiqoywzsCtuqBNXJJawzL+yboXAPEA182gLbQAXVFQb68DvgywFrVH/1JAL9TViQAKVuhwhA3ammaSv5a3+VUVyigddvZCbxIGtOy0zx5rEXwCXYgzagjckGos56VTdATuBHdzJ9a825fgHNcVvG+U/X5KYNhetfvUgOGXkgLzFynJaJcYj1xxq0sEBYsAKh+HT9lyC5e2cYm1dgSlOViHyUXbA1QrqrejPxl/e0Kea8xJumHXj4EVcEplWdx1+xoJqHQ0YzqUaBd6xA/RTWMbMUpYWWr0GmDBdlCtUeFGw+If2c5AThlaw5+5gAnitb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VkfXimEETndPLK+CWSPA3JsyzmP+VomadYG2Q+MaBkNeNkClqSvMiqbjKQUJLRfQ9Jx2IpRtKWRpKotlg8uXzuL31IILWsFO0SZbz0jdgi0MkEGuhv1AD2bCi3nX8JLxtm7t1AtSUm5g157RSkm8Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8aebf25-b204-49b9-2ea7-08d984190aa9 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:48:54.0013 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 085/218] avfilter/vf_zoompan: 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: AAnunJL8SMnD Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_zoompan.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index 58155bc162..25458b348b 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -325,8 +325,6 @@ static int activate(AVFilterContext *ctx) } } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -341,9 +339,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold void uninit(AVFilterContext *ctx) { ZPContext *s = ctx->priv; @@ -381,5 +376,5 @@ const AVFilter ff_vf_zoompan = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), };