From patchwork Thu Sep 30 13:39:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693455iob; Thu, 30 Sep 2021 06:54:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHvcqSTD/B8bIIDKwL5SJorIfPKUA4B4jut90A4Q9RQNvDg9xjMCu42m4nsh9VfIWmJ9lD X-Received: by 2002:a05:6402:3088:: with SMTP id de8mr7457950edb.76.1633010059374; Thu, 30 Sep 2021 06:54:19 -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 bx26si3487254edb.432.2021.09.30.06.54.18; Thu, 30 Sep 2021 06:54:19 -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="nTReuJK/"; 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 3A78968ADF2; Thu, 30 Sep 2021 16:46:34 +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-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7136A68A581 for ; Thu, 30 Sep 2021 16:46:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=akWE7AefjEuJyWD7qhsqmG2kmM8xIrOz6dVZ+VQ9i/Y5azWJleq2HAhvJNbn5YGBBXnEWhhhJ/ZG1txUzIbDXgNTSysY8WvMmJvev5ATw32GIjG6AGJmaaS4Ni8ShtQhtRJCnewuhJcU6X5YJjpvT3MXn3Yo1DpeVGwjXOBDEaIw4Oug1MUrB3sbgTUNVp+2VEu40QGcCeQjaTw2PQDk2sPloPdj7UMJWjNBlRTtsOUzM0wFvcanY+aJ8H5h4RGVUxOgm+hfhGcbABm8jrdWllEMQDldfnOB6HckRBLvKpZrXmrM1KbMHKgft6hYVUT15Dl6t5v0OG2YwFm6075SuQ== 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=/NKD+j195nrQAFXRruUcLaRDDRyR7yvMANfXuW5VbAw=; b=UMrAUeZj/Qh4qMlz9REDL4eYNfKWeIHT+QUOjE7n/n8MMwBXnPZ0Aat5WSn4MHy4cTXuxhcUjN8aOQEh0a98AK4UEE5sTeuZ8q3Dpr/u+0uHhzAdfEZRH7kZltHZsO85nFC3vXxVnCFemVEl+dYU4fBIF9o+g/UI6Azn37hUwbUUIgerSc2ZhdWXu2mOQk+S7XxSEhCK0KXCZ5DHFhH1Um6RHnXGju1EAe9IP88W5YX7CgCbHDDMHbV3WLdFIVpWrdQkjD/QI85n7aUQcLDMJok8z5MfhaIejElRlqEZzwRk1VVhe2P4Vl6yC5gEnXzJ0s+50P1t6SQKu364PaI24w== 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=/NKD+j195nrQAFXRruUcLaRDDRyR7yvMANfXuW5VbAw=; b=nTReuJK/2ggA8LZlI4MYLWFBTjIyqk9OFEbhmWu5G9UTISCZ5yIMRSXnicBxUUntlwDkUgjhjlE9Hk/TQtHEPJ8cFuGAIyRUa8cTxpwQa52kMJfUApQxQpxw5XohcReR8nleQyewTomnMu/rMx+5JNRTWXRgz1t3e4yD9Zdvrwm4xYhV81opWisborSBmPoSQhgr8FUlw8vHSislu1kdoW0eldL5+AtRkKezzYtOZYBJQXX/jgMuOXnH5k8ECMJyuYs+ta8q8QWT9JC3s6mj96LfcsYVwhPqQNddEf3Vn+lVjiRee5Gp1Gn6I7Dgf3lY7rqPdtcBy/KcrbMMb8TAxg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) 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:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [CxdFbn4HVu3/SzqY706/OzsAwYVRhUI4] 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-54-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04c9d929-4ec7-4ca4-dca5-08d98418b4fa X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgtb/iHUhgraew4c6cLOOORoLvinOI/9KhmVHxl5ATYpEXV0EpHRBV0RYJtH5Yu088CWDVkdd7ZGnat8flGOA8QnCRJBHL4OGS6rE3h2scZ2653gRey87MWa1Dgd4fFEXUfQ+nLTYWC7OndvHV9grlodfatApliJ4cSRItj4VgpHF6IszIz04N9piT72lXVH4XppVYrQVM0W8SPfxrP5AjdVj+DB4A6wf8QvRfiqlmjE9tMr5kNDukoK01VMv1Qb0m3yObWVrmPtZqzMVw9agOk7tcM7tXgLVvxMceE83HA6KjAUHVlnOp8wDmA6cO9W7NTBeZ8UkEscIA1NiwrEI5jdA7Fb3jx1452Y1xjwNEkGHrBxGgUK4qLFUTqFi78sqOLpZLags+Vz4ale6bIm3h/7gl3/IDIibHX8W4OiZONSLb0ztukNk8REIxg6uWsI+tTkL6+z1Cys2xjqQbXTdhIYH1CH8MZdKQKs/9xxW7EAVtY3PxWwRz/YV5BKq9dCEYztTJGfpYLFDObKn7etIt5YnlPtAsfOPx6otBr7T8Anz5G3rUL4cjJt4+03P2ZTVllZOl/ZA8nVnowirfLinlkOjznyV4+7qHDCG/vK5NoDd12GFO5+MapRCajEQosvmevYEhkOi8k5Y10lumvu/X5yJTzSNjHFXRaSX7uhc+EIeae6VJkYM8Jya/meutu46KIfdVvNE4nVZApmELZCFpNg= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nP2VSVxjtApPXVfU8RbuN9Pq4tZ6Th5pt1qVqSIGgf+ayiiwOKZAGfPSDQ/QJZEOVWCBzqljcSQZPskTfJZxa2tyzbyu5e3MVDqfMjQguENSFS0dF9Y5134DnRB0xgYJcSE6BUheaxPswzmQA6OH4lPqIfKBEcff5wfDhG7l+7aDBS1OzMiniroqtmv6wh6Tv6quvK8zcbZhGeTCLHD8YIt372IkVFbhNoS+eTzYizjnYcywixOOotsryVIwVIob1oALuV/sv31YiFY2miiaLzfrEHg0KYRAEF3LSnxs7rudh8KI4jNQxDGO/rNauU21MfFKnPpCLAqdP/IkPyVJQg5SN3FX8kZLyOwPFONrP34f3ADv9EPIPp1lZ4Xfsk8oJpBHKhZby8z+mhZPu8Uo9y1ktBcsrhZe/SHVYSrw7y5/R4FROSNkJnvXhUvYHgdR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YMmh9i+e2d9pSzQIYf/FDzXVMBKJmYLaZ4tNhCyCJuReJc8/P0t65F0U+yZEMWZzQDAIjtlm5t0NNGj/CYC2+Zp9yymQLbzqCmkr94CompCurK7jXAkzu0XwfkHM+MSSV1IL9Wzx8Rw8cGw/+5bnMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04c9d929-4ec7-4ca4-dca5-08d98418b4fa 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:30.2276 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 055/218] avfilter/vf_amplify: 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: 8Ybh3JUDxH9B Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_amplify.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index 558cbd918e..ed7dd80b5c 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -50,8 +50,6 @@ typedef struct AmplifyContext { AVFrame **frames; } AmplifyContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, @@ -78,8 +76,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} static av_cold int init(AVFilterContext *ctx) { @@ -316,7 +312,7 @@ const AVFilter ff_vf_amplify = { .priv_class = &lify_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,