From patchwork Thu Sep 30 13:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703090iob; Thu, 30 Sep 2021 07:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWBL5BUy9cic/2RbOb9swqDXC3Qwf6khLysj2vxa+NY1t3DZDIRFRnZohhDuRM8VsvAXje X-Received: by 2002:a05:6512:2184:: with SMTP id b4mr6076753lft.288.1633010673893; Thu, 30 Sep 2021 07:04:33 -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 z3si3270417ede.156.2021.09.30.07.04.33; Thu, 30 Sep 2021 07:04:33 -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=ii2dEwDq; 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 1C58968AFE0; Thu, 30 Sep 2021 16:50:17 +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-oln040092075092.outbound.protection.outlook.com [40.92.75.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 614D768A8B9 for ; Thu, 30 Sep 2021 16:50:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EomqlqEQp7v+WTjC5hqfIjcviFPF/Gbf6gmH1ShJeHFUUDYqJkS10ZZKf1ifWW/eyuoDZ5NfNJDEUdrAwinmC9XTC4A/71FseTuhiNl6Mk2X92UMwG+aM0oSaZz+8zFY0rbdrz3BLBaXQCwwBIWqbGh0krW79hdZEJaTEzdeZYmi0kcWOvzXQ+4tb5/W6+KXibtKHLKOS/YDfzGxRsWUiBTOfc/6cMZ8Gf8doPiZhvoN5JLtJP82mtG8mTK+ZZKktfEAM/c7F9Rekc8+xCqVUDB9dp+XsThguTr7p1sH3OWWXrorymAL/W0aO6E5CY00N260dn16+RjmcxY613kV7A== 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=jI2te5psOf8TqOEsJt9/xELdUNGtVRJb1aEMGCqYfsY=; b=ZDfXdBpAMDHGij9ckMZYjwdKoJpzagmiX6zn8DC8FfBND4b186k/gB6NguUvsv2dwMaHi3STNh1uhQvHsT4nhHqiunykOgm9PjKS+UeJZKKnKFHwtqSSe6LSg83kh7bBLLdZToz4CVHnF31cI3d0t5NqF9EKthSxKLlD+531aB3tPmVL0350kVfegya9mg5yVfJojn/oyGAWgT1s0DhoGFmmJihrFrPFOYVii4u9lgGKIrZ65SN/T0FY0Gs2uFSuJlWADn2sPQPemjWp3giGzqZ7qQjZ4pcjjxDALfMC2K5tftRrgXSAw+j+hSoTgRwqgD81t0vuheRNkSTxEqKM8A== 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=jI2te5psOf8TqOEsJt9/xELdUNGtVRJb1aEMGCqYfsY=; b=ii2dEwDqWsj+HkARV0NRsexiyTwpE0cT/J38RewMEh9EaVVxVNedXUOFXqa3f007317zmIAkL74Qfr02wNE0QFLFe15ALPzX3tMXT4p19zpQnW0MiuyXyzdL3zXQpkovxNxnNd/9yoyRVM6dwQOLNQ4PtoguN3nge+IHk3MnRFXTQerN+BXP9SQxqitm4pX7/PjA+SO4Wyx9TROyAwst3UoIAe8UrW5zoWqkfrVP40Z7akNOPAPlBCn8dHl4ckY3YRNvaj7dQt+UpygXITLgqgguoQLf6/fIq3ktorG1H1/13P+49Jc8Uk5GQOuFHNzpcVbcFe6gO4w/aFdfGBepQw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) 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:50:13 +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:50:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9ITzoqdyL+8nygImxcd93oJCI+xzam5V] 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-100-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:50:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f3ea523-a497-4394-1a24-08d984193a2b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbME1BhkaaQ+LE1kgMsfN2GYrltqgizIoqaE5I5Rx+WFOnVsUTUXsQtyfWNL6j4tjR0t9tAjtiwqN7fM9e4EfejXH+1kbaghK7+U2jQinOUfOBJwMeZHPbIgn8jnZtFnARBS0wKuX0U0I9EIdYIyVUc9jkghR+Kz3EemPB+1fsBZt1FJ09hUAYCotruAGWfxYNhXGkwPc9EUG2Q031F5AUS0qX3Bs2IBLPOuD7JmymUWxAmfjDT1P0Fx1WtWbzW8H4o+V1ZxqK9u7k/9cH0FVHtEpUK7LgmZ1EfVEU7FILOEn6x/nANGoLQymZipMkoAyq0/aHrbTyvhjjrbSIADr0M7uPcIGCr6miwcWfX5SyiJK/EM320yAYy3+TYSwXFOQ2mlk/D3UI/Tlt5N2j05X4pnHY5VZw3gNZvDEhq+tMBrprdQFC691/hUHPrSiYB7YSKRm8mW8CbuqFlzRHJiUKoplj/S5rfM9aZXJD2YXQNiaxMdGehGwgFFMRjnPRtbBPn+R45jBD9KEwKpCBcqkViJSWPP8dKCALTosDQLr3IJOKyW3quNGGnVol5zqYVyNU2sdt+Z+1fYJE7OkP46R/0XIwpASzOu/KabvoAWSsxc4hpvqaB6L9kTZpKesIkIKyE5Be/RU3ole3TnI39FRbWNTuwnli+V9t1IQuQPItXeFrER8ydvbL66qGIjZrWtXSZ11e2oEsiy1NTn90INijU4HcsiCv9YrXU= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4d93VMoF760YZ9LyzvjzzIe2fS/6t9ABSJv1uPA1epj0KdZuT+LPNvYbUclW99xv7ZdvZO8UXlvBAskpBvgbp6OvXbMLv4uXG6Vsro+Xs6mgJEvMBFxMB0zg1f+bMyA0tS5M5lN7flh1gBwrM+pOZm1BR4bGR6viQhIM/opjAfysLJHwYahmq/um9d1TnQF/xog4dS622fB4lqtkbnoB19xYZ7eJveP09pFBtR00+t9YiGLs/Tl/39Ht0FM2J5bhou7k0IIW69Lk8NXJqSBnPjk8NzkZxhwEGML2kwKuYXbHuYbHjf15iiwPlt/hsO4sOiPsuVu4XN/gOI1/E96AeEDxv+vHsGFmRMhz55CA8ht+upj6H09+fG/TViP2aUWFSCIm4mpE1My1CqaakWyyrVdQnmQ/zHgb3NL9mKY9s2DXlTHivH/LBUwGZ5LtDK9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dl3KeUKdxxzGS4sYZkIdBduXymiE6e9XiyAarve/ESKxj8RXvE+E8amu5RL5fUA9dZazJVuIiALoF644uO0xCosA/FELtq8QXDrEwzV6argaIHovLaZxug+VPPRhKJmmxD0IMaqgXJA8BrRfl3niCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f3ea523-a497-4394-1a24-08d984193a2b 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:50:13.6778 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 101/218] avfilter/vf_tinterlace: 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: GtPfZZ+vPWQB Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_tinterlace.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 91626192e0..d458e32d8b 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -87,8 +87,6 @@ static const AVRational standard_tbs[] = { {1001, 30000}, }; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -103,9 +101,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static void lowpass_line_c(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp, ptrdiff_t mref, ptrdiff_t pref, int clip_max) { @@ -557,7 +552,7 @@ const AVFilter ff_vf_tinterlace = { .uninit = uninit, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &tinterlace_class, }; @@ -570,6 +565,6 @@ const AVFilter ff_vf_interlace = { .uninit = uninit, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &interlace_class, };