From patchwork Tue Sep 21 06:27:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137717iob; Mon, 20 Sep 2021 23:29:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwofyz7vdI/+50W4uD41a6pifWRMdPDwbIIpV6XrfpUWNkC8/0qfUAGpqZLWS06Q/DC1iu+ X-Received: by 2002:a17:906:fc09:: with SMTP id ov9mr33165542ejb.128.1632205790595; Mon, 20 Sep 2021 23:29:50 -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 6si25128361eje.339.2021.09.20.23.29.50; Mon, 20 Sep 2021 23:29:50 -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=G1yCuC7f; 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 788A068B0F4; Tue, 21 Sep 2021 09:28:56 +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-oln040092066069.outbound.protection.outlook.com [40.92.66.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F36E68B0EF for ; Tue, 21 Sep 2021 09:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cMxqz3NSt3VBB4o2NVN9pxQqTsczxccxju+3emIY5dnqaLRD9my1f2nLtakAmwSecCA524ko7stB8YGbwQO9osiFbL019DilYrldUOe8zZ2uZ0e6Aw8CUuJlag616+1hMkle9i9HX3iuF7w3rpphW9hT8ziq6iAfthuG3/9QS0K6mDFIQbzz7/j9zb5GkVxynITpchVqJhO86TFtmqde43ricItc6cbLaQMucT93+BnhfhxULZIXtc+oLUaLOPVQd6Prs2RoDDtusG89+3oqRG61ub2yrBTHKvrnGH0GVe38C/e/mfujp4x28GtGpwp0OLHVNi27nwz1VhWTLiAPMQ== 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=uqfkNzZ+Eav8o+gP9P5gFSwnDOtkW7Y3Ujb5qG70gXk=; b=hgZcC8w0swVBuZyiYyPlIct3VQiKLUitY3vBkzCl/gitqLt4cHGo/t9ZbZHBQt/uSYeMecwgpNxQm5Xmo0TKGcSk3shDOSSXc/eAe6YiZopaYGfyMBGGlyt/EKFz31zQEXE821b7B6vnrd/KDv6C+gY1FAmlJP/XQn2p9qrKIcUzjN8m+8NkkuYG3UqXWQh7Uyq666YgHHtmwYYorkTQ76b+XHIijiUASPI69yV9OuUSxNHFuvDxIzam1Ow0GrmsJG+/+0/yKpNCGhz3p77AtYMBcjgg3UMq1kHVLrg0cnxSOACy9pTj6r5E+rFJAOXoGOOCoZ9w+FBz2GBxxPu1jQ== 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=uqfkNzZ+Eav8o+gP9P5gFSwnDOtkW7Y3Ujb5qG70gXk=; b=G1yCuC7fVR5iAodc6cydDHLgSppuuKY5d/B0lUyN8DfpHMk0NQJQklqCin/8kdVFLA6CLUO9s7PpdXScRlIKqCMhTT5U56T/kpC2sw5PdPmmhDBxaVjwwCzPFp/f9T965r0EfITw99b8kQ3CzdnBavMEX0mSy9hSjb277TB75PDHNdLl3VoryxCc3NCKqYYcb4z3TKy+NF4M3VhI5SKbGFq9KdVcMoY0bphmVN6tVYOB8ZD1jY0FNx1+BQI6bI/02S9sv/UrSkMZkLxvI3bushRhL81v4U85k8xmbZlJ2fL1/Wfw4TMGhY/sJtFMsduqv2zR18sPKuLDYdS1HnydkQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:28:52 +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.4523.016; Tue, 21 Sep 2021 06:28:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [U7b2+uRd4A/ThaRbpIAeTa6atXH3MTQ+] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 298a501b-7173-4a4c-5ba7-08d97cc91490 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJpXHh9ED89m0wgUHJw8xFFr3G3X+YfmCWOkgaZFqYqhQq+XG108wQSoF+leNkBi+BgE/SvpWBTXwvl6m/SocUci6wCHzH99l6U7JwUBUNORGZwY8pqOyylIPu60JVSyX6OEzliRK2BBRtuD8cp3XwH0LrTkzbdk4dEr3M3xUM6nu+SR9njuyjb9e7RXsVW4qZVOcDmt9zC0q9V9gQrYA5c6UvY7glIsRxcwL4l88n/UZ973Dm70qO6ObJ7x6k+uzPDFfJeLbYs7fogcMp0LrpelEp0dn26ToNkM+DIFMqTjUJNjDtSeC95Qn2Xxv9Y298KVGsQn0bTFxF7TnfXwimvLhI+DwtfKAm9Xbvb7eZ45UBJISQP4jep1WO0HErslw2TdcO7mmVbWOluIYKB9UDZ7oWJt3W0/P8OKDj5f7OPwPDv0i4Vf7quFgwyf6r4z1NsmKhjwxxdr+oKqa5FX063oNZaX2Ij8zhUyH2UndBL7KJeXRk+JiD48t0PoET9vdB0hqpHzVAK3fI1T7hF/L2tPQAYg9/+lK+vF6ogrdPkVZGQj7kLiJOeXKJMbktpOZzr57JtUiwEtg66Vq6TFgPtDndO0noX1pv+eTG1TfwmX/IilHrEr5JDh0pBNpaO0K+DRJx91Bg4l+kflCOf62Q9zwOL0AGYe1IBOt4JPG1ouda0+lysQ5vyduqmrOFtS4VM= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RtpUvYRe5pMhxSybYBcnziicSCWqCvJ/VbtvsZaz91kS9nG68wT6e0HgDTI6BHZ7K1626/sfkaIxearXKye9C4nyIWK8psdIPHjXUTa+TNdZVihYBDC/Sq4TJJxGCevHiEN/Qg2CjNfSL3Mr8+QalW5siqqd8Qgqppy+Ovv0pTR6LALN9RakI1iWzSq6OFkEUapXozavswp/zjq4gZw/OEXRKDSh2R7I9yBsi5xxn9vGE8YytCew7g7HQkiSq2LdvqNYQFaz0arXpspjrFbLaCqZcK0Ktf6MKlnYs1qh0DenHVXy97A4mCFhrRwL61ilEqppr0eN+Onu0yLx1fVbyQj6dgNVsTxxBeLPb/wkockznkWxlSRswtN0mvf71syUKfma1CkKoFQQhC3xKbD3xZW/ys1nDyFDcCSb0C1iYFv41r3kAcNEk+YxqHaybm8W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GFWl45K+1ziLNLxLyAMteOGpeCSi0WUGGv0N4WaKroMHiwKXLOr0H6ROMM9G9sx56k3aRPNvUYhUIhDenYhftz0YrXEhOK2e6r0NrTWALSLUx5hwj+yLKmjBGgV50eI0zuwXt3NzX9rdJu3bxl4TEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 298a501b-7173-4a4c-5ba7-08d97cc91490 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:52.6982 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 11/26] avfilter/vf_guided: Remove always-false format check 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: DvvP2b77jFno This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index f808ba1043..bf8be866e6 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -367,10 +367,6 @@ static int config_output(AVFilterLink *outlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } } outlink->w = mainlink->w;