From patchwork Tue Sep 21 06:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138988iob; Mon, 20 Sep 2021 23:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBDL1pZTtD0DqkzMzkE35gV+o3xkJHtSwTvXw7/jLkqKsK9WhsG8x0i9TnNE6sY1F+0q4W X-Received: by 2002:a17:907:7613:: with SMTP id jx19mr34112935ejc.453.1632205922542; Mon, 20 Sep 2021 23:32:02 -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 s19si18147093ejy.541.2021.09.20.23.32.02; Mon, 20 Sep 2021 23:32:02 -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=RXnMn0nk; 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 F151868B1F2; Tue, 21 Sep 2021 09:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2055.outbound.protection.outlook.com [40.92.89.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0377C68AF54 for ; Tue, 21 Sep 2021 09:30:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LD+JY5eiN1rV4bvqtP7AJw0bbwCT+llbZwI4Mr2Em6KZ/1qHnxqO4ZqjMqqx66ZO+otsrpJG13Raw2C38066+9UJXG/a6gO0/luwkC0KXcO1pB8q1n9yzbpwc80b06j6dierEiOVEeTPVbgCiHAyD6QaH+FiNxZNt4XPvCPeMhUgacIT41ucjwPhCokqObtHMcWW1+Xz3IUS4j+4MYqTAvZhhal2BtPkzuz+OVQqD/6I4cW7QWQ3NV5ZM8n6VzF/O1/0Q2xNxlhy5XRv6uinA7nNG86jDO9q0saeAcejeslmrGNKhU+Z//wHUne388S4PeO5SnU4QPNLWICibv4evA== 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=39U1reEJSaqZRNA4CDQ9evW6SiyRKKRLrKjybC72rCo=; b=N4Vu/HtySAdn5NYYg4wrb6dqok0NIDZFmlaJPOWAqWzDgqv8HAqs/GuJcH/A3uPk7onnrAs/8cxcTpmUMnItQ3WZp7Pw9OWFAn/oAjU3PYbUfmvAf92SzY05oAIc12PN2DhKdKW0OCXP3k2KSXrbcFCM7FLg5rbfmvgCavSxdXk1LGHVNMLRyuixNOxVyxGt8Fz7ijmduqPjAJGPtoQBCSudRseRzHMhgDybnCYTwIURpaBDWWEuL7IAIAdEc6dnrM9Lc53mI21byuo+sckuQM29tTlz7w6OClzxmLj+NTiRj8MuujpKXfM2nHdBUxK1poXdH6W7xCS11pYNIYTnuA== 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=39U1reEJSaqZRNA4CDQ9evW6SiyRKKRLrKjybC72rCo=; b=RXnMn0nkcbWdE6w4ccfZE2bP9Ha5cobcCq+QI/r68VnyZSACzb3y7mwVjZOGKFU6+Qb8KzFACj0FLmgGCCLUr5MpcZy/KMdhmCzb/fsMM38budSK+5+ABGcgATnyynVpo2Kka75qURGgwxzrWzOrKsxunnXD5SiXegjpm0FdzhSh1bKBrvxMAV6SRcEqFiUzPNWK15PIM9iXdiijGYx4HCqnhbftH+Gm1b2HkuX8RjOEzR7vI9tbMpYn4yEci4h3OiuWoe+ELW9MuTZoX429h/JUhSaEniXcM6W5su+FhkSfFudRs17NyGjNsLaEbur1l/B8T3XIJwa1Bz7p+7j8Nw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:30:07 +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:30:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6FDYjpIpogRjQQ/HHxA3XR7eXZsf/2gf] 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-20-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:30:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94f36096-f0d6-41b5-5acd-08d97cc9411a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLGPLnVkDQDfOQOxwVddJnuvoBSMxFaBx1CgyeuTT4IRImm09HDxUIToTOAHUynwM/lrXpqhC8dYSEMLBKdwQsT7GrZIzbuzdjgkfHT8xXSe6E0lkbu3XfLatXcdnEf+KebvuBxvUn+tzKXMBxBh3mbq5Me8PP3VBTiSqgqJ6/fcn0VoKO6qx3Y1s3pUh2cfioVLv9/rAvQO07nO8ikVBo46bBs28f+FElHNtkz3mTVTrMAK+sZbyl66hVRdGtOJJKhLEnzqmNTrFEBYidog4mkXU0B0KzmrHvritd8xde+gg2FkgIu0NB5hTo0TNjhO8YCUr9hFslHMGRCtmhoih5ZGbrZkOTgK3rIdPT1F0OF86Iu1qDVPD7ZoUP8fvYVByZoMB5mhEyRbSqBsLoszzXOxaWBIau4GNayn+KhNc7weAGYBubMj/PYvOY7Fyxqpzq28tVcaKW5QdCEetflt6KAh1FoFJBtz1Lsn8RVNlswntuSAsi+JzDTVEXHRjOhezHhL3VR13ROj5auGI8yvNhzbro3ZroPQqp8evkSvJ9mkSmHZSO7OG5IumTLOa43EIy3Zopt43iDb49e4UxdmzmgJ8HqPU+0eNNb/VscmnmFIYMZXn3yeH9pXlLSBsD/sgf2Vjb1orf/MGQPaYpfpOoJljqJ2JAmwfPE3M+O0FjpQz3fNN2w17zDfz6NMaK9ajGGEujzkUWU6A= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Z3apgcOmSW03oiDZrUvhbEC5bM/+n/qqzxb4QMo8rVKwz/mdVCe8DkQbqwVpFV/nSbpbyy0pb9Bcy3L3LuCiRyX2hh3GhjmVeCIlD2fsST5tOCoqB7U2QC7Ie+ONin8YI/8qHt/zFk25fqazLYZZPC5MY3P7QR/I2erfmlnkSNwElTk4sL+R6K2xGCvduQK9H5XdCmv++DDNLRWCuPk+cbkq456Mfkq60bMRX+eNyBrqbtUjoNVwFs1V3Lc+bgx42Kz/TllYw33/13eYUVaWZb2ThGlyDJUAQWk2nCufpwzFUi9GHWBInLKnVony9hJfgNMXKtdbR+fhcGzcvJsZ1EO9Yzvqj71YtnKnCfYBkZ7BB82bmkaFnF/KFo/ibAImKyLOjPogyf0TrNvyleFRu3bAxNxzxngB5zvdXgH6VheNaOTK4H4I6E741LFNcD2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: prHsqjr5enQmWa4AGN3MtLREumhCbMGkELTSWcVxiCbwt97bOenV2B+4vLjBoOsULxKnEAVrX5A4YbqguylGnDcwO++pMy/yhxb4UrFiIYLh71EkeODLCpeHj0+yiY7nM21gmoHKkj5Farno3x8zjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94f36096-f0d6-41b5-5acd-08d97cc9411a 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:30:07.4582 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 21/26] avfilter/vf_psnr: 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: /ilFdKywxZSu This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_psnr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index d254d0cb55..a4ce9a4c4c 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -332,10 +332,6 @@ static int config_input_ref(AVFilterLink *inlink) 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); - } s->max[0] = (1 << desc->comp[0].depth) - 1; s->max[1] = (1 << desc->comp[1].depth) - 1;