From patchwork Sat Sep 25 22:52:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2808812iob; Sat, 25 Sep 2021 15:52:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7ilDA4IOy1fD1ffDWOUipt4Q9Bc6CVqWpwQ7kSR/f8AL+3EpLXMpRdGY29XuVkVek5+9U X-Received: by 2002:a17:906:36d6:: with SMTP id b22mr18933593ejc.387.1632610365543; Sat, 25 Sep 2021 15:52:45 -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 j4si12470584ejo.567.2021.09.25.15.52.44; Sat, 25 Sep 2021 15:52:45 -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=ZhlE3AyU; 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 958D968A906; Sun, 26 Sep 2021 01:52:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075038.outbound.protection.outlook.com [40.92.75.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDAB068A852 for ; Sun, 26 Sep 2021 01:52:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T03rqqJ1VEMRaE4dgmhFRZwYs4/rXqbD+ggPSxfTx4ihGExESntoLhITjgohyIIjkiymMBVmeJFuTYOiqMcWB2U1a3ko++W7gP7IUCTdh7xXYDCxuefXUXGw0m7xAfbhSRRB8JiSti4+1+6LvFgXSIzrnQphXUg1mPnUNXScuQ8i+69V34vNHLoxpM5wGjPLwoKkbLTkI62viJCi2NFhPymxay3hFLth9BWvuLWv6A3RFie+yb5xpWTopy41KhE49aIkjq+MZyEleTLYQ/qCdMYagEXLMfpdIudz9Uj2ydQjER5x3lORef8FE6ymmOVLOs8m4qz9hghIlPa0xyO50g== 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=KVArdefVD1XXPNNBhZVFdC3pWnt5s5fhNHFwU/Qcelc=; b=bCgG+qn0DkZJySzM/kOMdrpZfU4k2fnJ3M6h7+VnyXk8WNfFD3frdFW8ZKC9LlPN9eyguPFXw0m74s9VxfTDsviRyBycd4Qmao7OdsIZcldtWKo10DXrOMyaGr5IjwoeaIiAP3MlBuZw7XnL563sLML6GCv+Lo7mmEwHbVsdrls9cQusuzhiSgZIC8Akr/bydqdTdTUoEdqymKfrMWjK/N3UK/ttakz0wPop8MRxt/p0FzwA+v5nW0JbTBeixT/yE7Ul9heqXXOhmnJp34UxLgcZX6xd/Y3SHmCHDph2Gkg59TNcIgziQH9fm0YS0AdI+0Hg4Nssv4P0oVP8hmMNqA== 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=KVArdefVD1XXPNNBhZVFdC3pWnt5s5fhNHFwU/Qcelc=; b=ZhlE3AyU8YuvVpa8ekdCGkP7ZdlA7EKldeG8wU7vPbveo4AQ8a5jVIV2GdoKqoT3OegXBt/ERANQdPVmskR991p3dSMpEEbHJjt8KZP3BD8243xiJD/BrOHjJA0dCB1jfMkbwh83XsmxOuxczDr45a3gs5Hl4ipcnWRIdfny+GJZVihRPZdN+PGO3USAaV9tfwcosFKFbNqGIWYLEfI1iD+m/FvzObmKpcX30s2yCmxCtMDR5YRmN/gAAKg55YB58xfZaBmUa52NrYT2vMRR+fS1aFfOSx7xgDuYSLBocGxkvTNwzUCVKfjrB6hgxTfqztPtUbs7zcLvP1y2UXky8g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5926.eurprd03.prod.outlook.com (2603:10a6:20b:e7::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Sat, 25 Sep 2021 22:52:32 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Sat, 25 Sep 2021 22:52:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Sep 2021 00:52:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [HBzQpxd81Y5YQFzZidlItIsINhU7pPky] X-ClientProxiedBy: PR3P192CA0030.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210925225220.175182-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P192CA0030.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Sat, 25 Sep 2021 22:52:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c55d88c7-8b78-44a7-d4b4-08d980772759 X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wom4HOLjhpPwl6SghFHdFexrvCVMeyMxK6FjhWIXHNbIIu6mn5fnaz6OlCM7bDl0TsAOvAwHnLJDVrRqepBlCu1VEDKV2FAgHNhpSnA8wQKnpLat/4zzY8FmUUqAE4y3rvOLdncfK2GzL785JLCVP31m6O8mQDEcnppqft+tVBNCwrT3TcIoWEJtbVGMf//2K0/fK7QHjWuSh4dShxee+WKGc2MCm1ttH+r6QQdzNDvuG4Pe+wNqSdS205553bO9osh9UgKcMjZF6yW+zi2PidhESN0E4lSqasNzj68TBWpIIZ+eN3ncBh9OZLYyZ2PdhAUfyfazxmenJLprOa4TUDG9UYhjVzWR/GS8ELL6hsinJdwVkU0iELGb1xcrTG8AWxLTn43OnDM7cbzqm0Xs1NGozWYMwVoWWX1z3By7lABP+x7cAvIm4iqVjgMAO/F+tVgvs5SOgz3PE/5vkGsUR24TeMAMnGeY0BfzlslpKDWh+05R3MZ2Rsf4I0fxdZRtspkEZqh7qxOviePoUx35I1uuNph6z+9xnQFvkWrQk/w6Z4yrkEEnu8Dg9sYubGUO+rYK88vprxOveHvfb0acre3wVmIImtLpwlvPgq8rQ3I65Zl6OphESqzrOF5ZZCp2+f/rx7J1NTiuJcMeLmaVP4Eue9kWZ2E6nACoex8OmwKrEiTBCXAFc7OM4YLSOIc3/eGRl3NWODp7jw1W8TXIHIGJ3X38sVrzo7kR199nq1qxEQSwqXb8wdO23JDkHndQpNE= X-MS-TrafficTypeDiagnostic: AM6PR03MB5926: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cbmo+245Jf2J1Gg0isUiEayY5zZymlkkv+dnKfzZbORg/L+Rx/Oq6tstsSqTHcfbcMQ9e8xp7D7Qw3q2knnsqGlrpLvpOC8JY38KSgzJpdX/jtOklO3DY1tNElrqqW0vaGU4A2AChXFm3K46IuRW3fHU9GrxnDgdsULwy25mM7a/ga6z7nLKsL4lgKHRNzYrVr2MFrYgE4zcks+busRL4pkJrpMxYf4HKl3h8r4pjaCPqFx//ZIl1A0ISPIJogmkdV9gBHrQQfgO+fULIpNs+SUtJI/Xr5Ziw/kYpS/iJwVyXNILZmT8YtCCT65x9qQRSuxO7n7raf8k9F2vIawD0f6pgOQzvI/sn0ZglngBXAeJiGVNyZp83xAddyf/F95Y1b153W4JM2zy0iXC/o0iBJoiLFvNVuUfvhoid9KV8JyphX6EpM+ln4ytKZkB6wGc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gaTQAp4K/r/ucqopFOQ02W3HqMGLiv6g4uew99qoPy837x31QHYWD4eSSjw20i4WjuU51SHRZgnBm1SVXkGG8IUUsMM8vvTecm0Up9AZLBnuVFvGcp+HHwwHMNX6wpQAqr65KwUDNZ+Q+hcDMA4izg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c55d88c7-8b78-44a7-d4b4-08d980772759 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2021 22:52:32.5891 (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: AM6PR03MB5926 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_swaprect: Use ff_formats_pixdesc_filter() 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: 6Xt5wNKcBaXJ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_swaprect.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index 4a5f4a12a6..fff9b53dc4 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -22,7 +22,6 @@ #include "libavutil/eval.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" -#include "libavutil/pixdesc.h" #include "avfilter.h" #include "formats.h" @@ -59,16 +58,13 @@ AVFILTER_DEFINE_CLASS(swaprect); static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; - int fmt, ret; - - for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); - if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & AV_PIX_FMT_FLAG_HWACCEL || - desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && - (ret = ff_add_format(&pix_fmts, fmt)) < 0) - return ret; - } + int ret; + + ret = ff_formats_pixdesc_filter(&pix_fmts, 0, AV_PIX_FMT_FLAG_PAL | + AV_PIX_FMT_FLAG_HWACCEL | + AV_PIX_FMT_FLAG_BITSTREAM); + if (ret < 0) + return ret; return ff_set_common_formats(ctx, pix_fmts); }