From patchwork Tue Sep 21 06:27: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: 30419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139089iob; Mon, 20 Sep 2021 23:32:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqlc+mbKthaLudEmeBk1n/OfujHPOKtMqxpwhTJxBqBq9AtBL0bTeDejmuwNOW1M66cq6Q X-Received: by 2002:aa7:c78f:: with SMTP id n15mr33860056eds.338.1632205933865; Mon, 20 Sep 2021 23:32:13 -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 qw21si8900125ejc.356.2021.09.20.23.32.13; Mon, 20 Sep 2021 23:32:13 -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=WUP46D43; 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 12D4C68B1FD; Tue, 21 Sep 2021 09:30:16 +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-oln040092075042.outbound.protection.outlook.com [40.92.75.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4101068B1E7 for ; Tue, 21 Sep 2021 09:30:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gra54yIBKALQscX7aMN4QbgNPjOolS5IKzlX0QAjY4zFGend3bWTnXpQ52UW7iU+yvL6e+MOdcuB2Zw5CJhQvu3L3EOvdVu0SQZkd+05GKWUgjVzSN91QAQs/kMppF8OC6XhC/lys2/uPmOLtW73Sr/M1qVRMu/86s/G2VMwcMmMv0RpqhRqgYI8ZLqX9+Kr9lTHVnDrUTUivsg8nzwFBvdzIovX3H8dK7jdlTjUkLdLu6vatr9Z/3AaUSVAwcwjHDcK+B8SfVkvC30Z8RylViriuzKA0kVbVAhohps647wisWa8Zif0bLeB0W+4ThyB6MLwRDhnEzv2Co7STK4x3A== 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=49xyzVHyPM2RSgBx+xsHHnaDzipwF7Ii1Fn4/YB6XFU=; b=C72iiCMjMsvBFkEcfSq1rYgcktez6qJ2n6BUVjr4CVWb6ofQ8F8hPCEhNUrNh2b4OHOcMMOBDNnO8JCB+ELFif32DsZ/zW2rxbjomfcOELBZRqfnkvHL35OOLA7Ol52BpH/YwQ7y6/JLGzkFQJdij6p1CAJMVBmNJmB/eJY7RJXIjgjiqImgf/rAaGWrYLA4zAbBbg1fJGwWLQ6u/iOk5fI1n8qaWdJ4WGYjRMPljT0VpJbAbQxHIWFFSwxe2RG7gf8a1OuvlvO6LErzLeEXxUpEdjo/NFgJvfSOcS2g3F29lhrSWopGBAdqkS9Jo9zxzpPtiV/Apo2NzXP9eglhFw== 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=49xyzVHyPM2RSgBx+xsHHnaDzipwF7Ii1Fn4/YB6XFU=; b=WUP46D43PK7ME3qpiXfmX4A08ArqVk78zXcdQUthcVYc4X1UbzFAtjMPZchbfvXP0CmxoOI19XkI1eXIvo0+/Z6hhjmfu2Wo7gc5kx7xuNz9ZjwfckgIzNTXiat/r1xSKJknHyjD/RhlwG7cQgT1vwGgKKYUqRIqObDF21sln1e0RkncoqGoG/AzMxDP9IRfXh8LVpK4LQzEbx7oAQGaTbYSURGIa57m8dxV3GE7xB0KoSTyMGRVRQuv18jXX36RcJN5QGwHH81TO6Rg4xgPI7370mqaM0UE/7fRytEvhoQ5IxP45Vy8JPdo1Dd1vpukTqXWElibhSCG9C3oLmGRIw== 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sM32/hXGDNt4hPEiZYGGp25bTDIl7G9o] 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-21-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:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 207c279f-8cac-40a8-b7b3-08d97cc9445c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLGPLnVkDQDfOQOxwVddJnut3aKiSFDBdXFmZWu4NTsrVcYmU9T2iqLeC9v2VN7cua2wdptMIphfWk7rofrDbeex1jLAfqwpX/SNhnAIRx9aHRreKVhJRvvfLiDR652xY+Ojdc1TOPoTkp66ifUiJZu9bSjVLo6UKK5PGpNGOeb2P0hy4dU1c5Jk+/m2u3jOH9zwqEEtBnksFvbdB0+NZxbxmByScD05Mc0/ECJSNlM6Z0jopG1CRWEZgu1flq/Ej2ZSgC7x5xkJr7x7N6C289bgn8gU0M1qjS3Aek8N549J2COp7gG0+KGxIx7AtX7dd002U7YP3vYKg9P3CVGvzRKz+EVj4DUuM+ev2ZuwPdop6DrN7A4l1NRpDEaqFQVC7C1+5KRH7+uvXGK4O3WW3h27XyUmFOS1QGC6N/zrURr6RAAhrtBhKA41OJuoGNxEP3uweLKyfP9cbv+QZJf36ZMXsMFgr6TeRbG6O9wsFKUxGK1Cwn77bb06KmLugegheQQmKDS1h62oP76mcWAm1G3cMmRK4DD5Y9GFFh3z7B1OdmMHF2qIN2H61imLhbOEugaV1u0/zmsT6eub51URZI5krNYR1jNE2jytDtqQeTlEzSqjuMIxGG4Ml1POGwBKpxSIBzcbcuw7L3O6rAgABpy9yg9+Y14fbaS2ifyc7libUel0MT7n+MJ0yBqJKUVzWAW/xOaRfoRug= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qpi1+/UOrMTTDxkfCYgTRHe9sWMUWbMUf+HT8B3nFj7KDYKvTK22KiIRyysePNJ/EMcErVPD447tPi3oyLoiLKLiyHKv1dMdmC8VPuC6x9P0uYpHIQqXiAlN0P+LARL7KTXuJjA4BmcCdpv94QJOaSYwb7d2smNphsNRGPNPS0+fjXQ389GKjKI10Ns1uX2GRh9DJdM8T4q8vHh5NFO1hNGl9ebboKcXQ5CWR9B2M/j807XZqHjS09kf5+WQiaTQLmuW+mRZzl4TxwtOig6PUwGbwWhAygr7VCaRk4JnakHcs9iplyZ89I5sZ26/82wNcog78Mp+BncinUWGoJeTdiDczEaxAN4LT1dywUYSbdmPxAywui0an2p0Hcig4MSJ8WyMTymd3NQ44GzuNh2F/omel07bO0i8MHzyN5R47MVQDJf/MIfj/oJwebtlEkNP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +yaR8zubNFkGE+OetNvQCf0rXVzrUBuprSm2lMkNTANgqQQJM0dOpZCulqq3SDNwr8PBNnKMQBric3cD8vIv/LtIyJqBajryFd4/Is/78waYDZGf+Vfhp1hLes1JyhfsPie50q7I2u8m9cMltImLYg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 207c279f-8cac-40a8-b7b3-08d97cc9445c 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:12.9183 (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 22/26] avfilter/vf_ssim: 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: 222zOjYjxCBZ This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 61a84ff990..14d7ab3ec6 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -453,10 +453,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->is_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; s->comps[0] = s->is_rgb ? 'R' : 'Y';