From patchwork Thu Sep 30 13:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp702512iob; Thu, 30 Sep 2021 07:04:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1dacaOe3xobN7CBNs+DeAIPENnmnCAzSaASDoW/8K6f2d7DtqfwmTlaKuV9C0sczppScn X-Received: by 2002:a50:da8d:: with SMTP id q13mr7606172edj.198.1633010643866; Thu, 30 Sep 2021 07:04:03 -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 kq18si3981609ejb.533.2021.09.30.07.04.03; Thu, 30 Sep 2021 07:04:03 -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="J/l7L5hP"; 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 C3B55680979; Thu, 30 Sep 2021 16:49:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066048.outbound.protection.outlook.com [40.92.66.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B76068AF29 for ; Thu, 30 Sep 2021 16:49:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CDcnNm6tqHhH1vbRQ8zvEawwYoiS6BaWMDnPB5PFD/u5B8eqxQxyt7AKHU6Y7tw37fx6a1vyCekbFTtsilg9pGReUueMNT0kgBF/HR28zoKeLh5wpAbMEcTAC62YXDtZT7EDHpOqL61JCmUQc2vkNyWXNaToV2tXxKif5IMZIkDnartPSVpLScUIWX7cOBTE+Ubkk7Y8+uHNdLeP4M1LKMBVirBNrcG/zgflnifd+huZ3IiWKUQk+ArwrtFW1HPzFGhJ2+tcmYkV/rvUaJZOFACE3r1lmt9xMdPcvlUTuYE8C3dCq1pEIkqVNtL6LbGDN0eZTSxbN5CITY7+wzSU9w== 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=hBXPek0yOO30HwpHGFMt/zeMx41OyZAj3rbYQvO0NQg=; b=OtCeCbxhrajp1tqWR5MMrGPfjHlc5mmsl65ueK9e1h3waj+o+l+QafdDgBziPUpHiEIOf00MqeQSY6BUidGTxagFFCZfObRhm25GGED15ye5yaf8blsy60OLjGsnOYwIu3t4IUEGH+ng+QLwkqppjAtCd7PMkzt2pv+sFyqtILv065/tAv7vSCX7BqLg3ej6PVQ02Zalq7wID2VPiWqRgRuKWBmvoYSqGGm/jj/XtfbK0tC3OlHAoBvztvzddRiuaxlUeSqoMF4KbanPMQTcCQeAZ4MJrXe6fJl+D0bjdMdhULpVPFrxyn+ZajUQI6vBWJHY/UE4u7PTW9LzvKI4Eg== 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=hBXPek0yOO30HwpHGFMt/zeMx41OyZAj3rbYQvO0NQg=; b=J/l7L5hPdJpXUTYuQ7pxILDzamdRU64CphjQ2IDZ+YjIa/PPoxfjTudwg71CHEjcgSAtPYLll4q/ViJveR1RethoFNGv4f2vRYpNlvnn7MbuEdj5bAyI2/jidmdz5phbVIAoQ1yW4KrvCanfkHfwGZIjIk0BH/NTRD1Y1u7U5nmd2ZDO7XTzbxjQYdw13JGJS1EDze2HSs5ZC7D+V8+twKAVlp8BDUw4Ob3B3rlaJiGHDagmaBJ2SZjwW3wkBpyGYRJ+VGilzBJgbHOplIAlOLkd6DRkIotyJ7MzCGbOcbAHWu7G0ui5KQn+mjv9x/EOzIC9iINUp6cJ0h7sJsTyIw== 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:49:35 +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:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VmQ9lXzm0W/qENkXgs7uIH2tLPr9QEwL] 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-98-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:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f2bc4b6-cdc1-48f5-a117-08d984192348 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbMn9bKw5PgbHeM2d6Pmp6D/VTxkEq7gjBlrq946QuFgcvV3vOxVnuMVsjYsPcztT6ghEDrsoOkObf74xTwrRnh/GSTV3l7YLjImkXiN70kh1N8GC+QQoVZwSKYL2zKzIo2R+QOignoGtGF1MMLWV8j2F8VTYOJLXrh3/BBwvP9OOsmrgbyJiBFMGVnaZRcG1uZw/99D6u4OIueZwtIoz18no77iLZs/duBU/axO9NeVEDyKNTzK5TrnRw/O0LkhxcI4s7APeISQXQQxM5W7tsjtVkEFOjfLpgW8PpVw6HS0FYaY5CGa+6tjNtHc9u9Yt80w6sDjCTyAgRB4VP8pP5aj617qBhpm06Kmwz7hJeezZAIMMnUGEFHI/MmBw90ey/wIlCFSKi5yaDc1pq0RckUVlGkbuSd+p20+QsKiNtbSATFhF2po4fqVoEnZsO30eSxvgoy/R2Y9LmoQkiE7POwD9LCtuBcTwU9bvjL0RKLodPv5NLf4tk+lC33Klu6wcCPJKaYpeCmPs1IXhIl34hQjoiUfUqbyUIqVci3i+1WBeJTAw+PCPSe2flTHRoLxHHmtxuUAdB3UNoCCseezuB0pwERoFs2Qd3Vg8vjnlo+Bb5Ijvx2X/B0jEfoN4iKXtBxcdYPiS1UAF0tXp4mqjFpm8fAb3QCT7LQkbjXBP+p53rii8tIY9ORWjMhIUjT6rTKJdnmacRhYW2T4kf8H91wWbHNvlf6qXuk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DEelBsNqQ8Wlp7jYCOtJZmHecMokTpuClJaAxBERDwO+eo7g3UDY4p+eTS3Yg8P72cvKOeqiJJ+cAvBX59LJRQ21BwIggm0P9f4phTrkwd4YjIfvlV1257l/3V3H0tFYarBDEq+LYKbZpkvpVNF4QOBpNoRnG9br1JoWgbuhNkbqy/h2Y1ttZU3re/GYC8eqBbCl8GuBNPspnqC0hRyRWJjXcwUMOJHL5x2kyQvpP0HTKsF8vKMWePFNHl+qEJCN4IsqrQPibkxKsEFQFSOpoOtSAVoE8HPLmKNEhAQYzRWPxkYSngkFjDSQGjjTMzoh+fzLKNSYnv0HPGE0UK1ipRk+Ke1LDqWIhJXNT0M42LuqTUNvGGHxCQdYtWzN/R/IDOVKF+mXNNlsbutC+a+CbEM0J4CvltxO4z4dj39yUVvWllnN8F4L80AEFSWSRA54 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7XNuHZvX2l18MfBOJCb2qMnInVubNTj/jsr4qmFlCpoNJ++7Pk9uQZM69fHtl+vrR2avsxms2HzGERyLGdRsv5Z7pIEGdMbvbvIyZJ4WGrN6yXc0YUXHam0z9oYqamYpmI1RCgU51zoTT8N8BkfMjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f2bc4b6-cdc1-48f5-a117-08d984192348 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:35.2827 (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 099/218] avfilter/vf_unsharp: 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: HvQ+wR05WGJ0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_unsharp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 85182910f6..ea230a4508 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -197,8 +197,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, @@ -209,9 +207,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width) { int z; @@ -361,6 +356,6 @@ const AVFilter ff_vf_unsharp = { .uninit = uninit, FILTER_INPUTS(avfilter_vf_unsharp_inputs), FILTER_OUTPUTS(avfilter_vf_unsharp_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };