From patchwork Thu Sep 30 13:40:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699533iob; Thu, 30 Sep 2021 07:01:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrvqr4KWhsOZ0eZxRx9n61ptTc+UzcNv0xsr7O7rzTyBxbBZWxMQDjDhmK9QWWXcvixSmN X-Received: by 2002:a05:6402:19ba:: with SMTP id o26mr7415874edz.1.1633010469164; Thu, 30 Sep 2021 07:01:09 -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 e3si2687687edc.615.2021.09.30.07.01.07; Thu, 30 Sep 2021 07:01:09 -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="Aa51/8Pt"; 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 BD6E468AF5D; Thu, 30 Sep 2021 16:49:05 +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-vi1eur05olkn2106.outbound.protection.outlook.com [40.92.90.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0888268AF4C for ; Thu, 30 Sep 2021 16:49:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LKZjtzCbKIg9SDikchuFfkyfQGDmpbXLmuUTm+KcQHhp0JXPYMNMX1/mmo1AdtXwU1/WrFj6xr4443EDfXYrgLWhI60RR9G6mVN5uCTrkTfISobMRd4sGfshW1ERMbK+7F9329CnXhhmbjgI23VaGUG8J4lJMfmv4B4C4s3So5t3ASslMYX1P8BM09BoSBy1f4MZgCyM9VwkR12qTT8lbQM4jXAX+A8G+FBBSMWOp/+dgqOFk4/NowGt8AxwNQ0BznIG1IKhMlu81jKcrJFbpIguzIfc+0k1ErP3MTGVt99N0haw0V8IE/TL2zrDNhGyaR7vzvdKbLowSu7+lSvaow== 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=OXHCqehfXkp1bz8G1n2uVA+cDGJqvU20ctdFi+kFn6U=; b=Jl+WeiThEHPIcIYPFwMSPwr6QSBAxhKV5dPjmK8cRWreCxWUqwDfgxak2pOWeNTkmPA1uiPrSmwWH/LQlpIbGQMvFN7nlkxi+I24FOvUqmt+iCQUA/joHEAsvkXsHhT7DccwpO6ztnUvRgEJqx7ITblXEOYj2ld+jlBRbNCZ1drcVo31ZR0A60GDAxQtqvcK6CcYYoisok5uUsnPNaxRNk4XlsScNMsNEmyHFpTxh5fFjEAobi3CEJXHRDgmptIMlJctJpn0hdu69qU/LF8RU5/8cn1RQDxaVgvGtwdAlPcDIRzSGQrS3o3e/rNi6A6yycBKj3Y+HqZak7MvjP7Sjw== 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=OXHCqehfXkp1bz8G1n2uVA+cDGJqvU20ctdFi+kFn6U=; b=Aa51/8PtolayEHVvwLVwp2NSgMudfsLott2+fzBcpXzxtJxSgANQb8EoSGeMKzx/QW9yec2wBBKX96KpYN8mzH3VWptfPQegfb6N7bC20gEP/YMa3yZZ/vGCeR+FWBj3YwVhk05f2HZISd4RABtPuPw/HVN6gQHGdXdnvjepzyIjBlVauQCZfG8H2whUphJOiBpvFGLi0MctAB2am0mAlcAbtDFh9T97jImlsqq8vOL5ucKmea+yWxpLD9ZmVE9e4V1YZJnzjO70TpBOoFNbdVHVn2+nmH45B8Z7Eq5BLT+8k5MYl+1uznc70cXrkVEu2LtorOOaozfvcKuyUnYegQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:49:03 +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:49:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [coC6hOI7HtalHMRZoyURd1zy7/VSh8Cu] 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-87-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:49:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4947587d-ff29-4e0d-27a4-08d984191000 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENwp6xTyaJPLWpADTJwfHoFCXR5/pf+BcqsQMUFVOIKcW8cDR8dt+uyQdj0MKpCdNX1zqkmjaGu4qTWVKSYiwk8vpd66ugIdTKxN6397v5I1cJQaMhrK4Q+lBgyt2LuCqzOie+1itrNe5eaO7C12hGhNoJc/4Hl1hE1eNIqtC/9YTioa97ffMCC3rrMAZVYhac9MPAWs4DXz+v4ygti0xgxTJtJ9zJkD0wPQhXDccJShk4eT0Lly5GQpJVjk3P9zCFx/pBxVVhTz5C3OaH5Qy5GcoGY8/++sMjbyn2pOZXJ+EDffVy5wp3UkDY0qbfHtHnSiretBpEQ5XzSUe7cG9WsAAcccgmFHjYUUn7/gzjrkIeW9dNZI5pc4mIFmi/I3HV0gqSjrnW0D/a6Ker0tF1sr/F0E4Bxb1nnvDh2oEJC5MKU3kQ0YkZP0jM+ATh9naQY0TIo3vk/n3pG3vP+Nztu6yHPkr3Vp5ndLcbm+kbZXxPDgoOVFs8pFQdDoPyzdUXbFa+V5gYk0ai6NHXapUACfYHrzykHetlKhDsl4aPdmNDnb7DpgRftHOmKfsnM9IYEdfS/D/ME3ZGojKFTY1rMrDvFAbioxQKkgleCz2iaE7frzozZmiv1wxJx/iqqyQgk7npMxtKzlPCvqSmPRJb91CyLezjApP/x/EW5QoWvRXB+ZHFlpJAmNttP6szBvSoDIgEbgRmnRTOioOGWOqPY= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +aUvtBCvNH/U+8TjFjMSJPzAkTSdABnrPV+ovVbRcxj0pkN+4mCz7bEHqrgSJavc6t5TRYgEWipokAq6kf9hOtmehrjZF4uhaYZNtxB34HerCtjmUrksUS/To8TPaOPT808plsi6k6FqoMtYnKbYoTBOoYkcCGjLbXDzaR6OCG3nm0U8+0XS9ONv0JStxmZG8diTBGnoffGlNVWnwWRsoVlfsy2zcv+EZSvMBsf4LtkJjUIbp15K13+D+0iJPyPmTN0anMnuqfbqrU0P/Hx4kw01CWDqq6XZh/6MuKX0O8CO1rgac+f2gREOo/HODl3Mh1fUodKNOUE5cILuiV7nPcGUg0EiQBSCU6hpHeESCXv2vkgOj+LXGGSTg+5N/79AfO9xpldYXYeP7Gd3mupLPiBCChIo8S9/80GFvIHVepU5gOuXm40chUljt38MO/w4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xo3AP5EkLLVor4EnVGj1yqyVEnbxTqrKUcRFJhXypuQ8yh0ITvPriExKRRnEZ/hihUmRAEjNi1Ca3Sy/K/5aWqvgxsp34aL7YeZTTpUsbOJ0P3kFyNYMkWFTeddRHl5AW8sQcQYtCo381PFN2LIqGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4947587d-ff29-4e0d-27a4-08d984191000 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:49:02.9300 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 088/218] avfilter/vf_xfade: 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: 9UALSr73vqQQ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xfade.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index d5506a44a8..10f0edae52 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -117,8 +117,6 @@ typedef struct ThreadData { float progress; } ThreadData; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVJ444P, @@ -138,9 +136,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) { XFadeContext *s = ctx->priv; @@ -2005,6 +2000,6 @@ const AVFilter ff_vf_xfade = { .uninit = uninit, FILTER_INPUTS(xfade_inputs), FILTER_OUTPUTS(xfade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SLICE_THREADS, };