From patchwork Tue Sep 21 06:27:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137962iob; Mon, 20 Sep 2021 23:30:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7lqrc+f1pDsoHPDfQTOAcKLbKTptqpNU8QnByvBUcXTDFIx2+KbWQdV7mCoSD93mUDSje X-Received: by 2002:a17:906:38c8:: with SMTP id r8mr32081014ejd.172.1632205820042; Mon, 20 Sep 2021 23:30:20 -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 p17si18181198ejn.242.2021.09.20.23.30.19; Mon, 20 Sep 2021 23:30:20 -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=ukysoC2o; 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 EF1C268B195; Tue, 21 Sep 2021 09:29:14 +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-oln040092066064.outbound.protection.outlook.com [40.92.66.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC9468B182 for ; Tue, 21 Sep 2021 09:29:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJp7UoL+O4DY+pNHdgB7yHGdZHxtt2A3EfPUxoJ1tVxuBOFZT1NtiezjH7bcpTfPA3z5v/EFCogMD0oXi2PBRX3qZAqHcicVEd0HSgo/TLJmuV0E0gMGaiu8E0+mRIuHRf3BjsCfof7R54kt1bYyNuNOQ5BWevp2BLFnnhvf+AvziQn5t33TtBhdSW5a38qY4hk5sMSqtJJzcDdet4zn8l5vCZJn+zf6bt9BNwR5w4sqkOrgUiyEvvTsgXJpO6wemAWy4v3eoRFEc2blROsNd5WteqJB4VaqJICZXT0ybsKDZQu4SjFuA8A6dh8TleeZiAvD83k5WxSdcJ82YskVPQ== 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=OBc/qqBylGks9WlGbxXiXdJcWm6DHLzh+ckg8mdOtps=; b=E8HjW9YtiVrdtdEaZptikGs9DoW9RwR0xHxgiKdOGvEG2aucV/uiayJcZGQnIWglzsph/1YtVuBpDuFFH/iM/0rzwgYqkb2tWozCgKvPKF+lE8SSzeh24NJUsOQTGMUkilhvJa3kTihy0cyazmCODrSv9zq4T0DkBbaZg5p3CHftarOvvI63cilC/o7+LWPNqQQAdiyrs6uY/wmxSfu7mVQCL+cx9Zvy2Gs4Iku13wJ4F5XoD6gY3YVad+ngcHr8MYbtap3jo4thAHtNmFJ8fD3JvnkAc2AWlXMbMAn7aUOkKJ6dhoKb/iPfYb7pZzIbNrm7XLus6rct2OjqRTAHTQ== 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=OBc/qqBylGks9WlGbxXiXdJcWm6DHLzh+ckg8mdOtps=; b=ukysoC2ouF5JnXO4T3niIEg9ZCMezd6Q9RGvRXUCqBmbzQUSE24rFSR7VqUg3OweXNA5y6PhWpO7QNl2FDpDzgPfeV1n3vn1pXG3Dw7uNW3VK+mV4cFBhrQQzaHZoTZDc5+6PxLt5ClJrqGsf+ANpekzOehMDQyo5lIkB0QmN0GSPCBXUpwwwG4Uf1el73/5NriQFttrAqRfzDbBiuFFcuWVFmk4uLRWWrIPmvAAhimso2WjuRQsPRGG9Jp+Ed6gtCRhkPjv6BbqtNjHmVPrNdXu8u85H/FhodwfxMyJ2Pz7jaCw6OeunV9456/ZafSgBM1bi9adjbcOnN97PVQxXg== 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:29: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:29:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [uv8mlSW/hQDdOAPEMZZryR4KbWOupt7x] 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-13-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:29:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d079b67c-d41a-40e6-e44a-08d97cc920d6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJpXHh9ED89m0+oIpkPvpSK8fHnKcpTXyvY1n4sWRV2QNTt6BRARkmim/CU180GTBBURip8OQETNOOjeitrGs0ycUYJrcJNnTCpW6tyoweBfGahTPowzWFGUHxNIPUz726r1tTQwPWnr1jcUibOOJineX/Q8lDt3ClLdsEPcqEa7ScaiJKuvChvto/Z3SmS+zzlJ/608O6YmUvlVnuF1ZXHmGTAq1o8Dgm1i3cklXEyBl0aq3MHkrcFdYpa5+H0JiydbOu9MLl61f0M5pVYMBOTAf/xB5qKSjO0JNb818jrUUYb98EgmCb2yGe4Nl9TkfqkdmR6qhrg12L7qMO9yx+WdbfEKLowzqWCoccRltlqVZyT2EIK74qUL2ZCQ4NLCiZv5NBjzUewdeuQNF62RCN8tWLK65UFKIRf8RygQTGpKa96lXTQ2FGd0ght1bik84H7NHBngHeZ54AyloUUrD2bRFHx/CULsdFw3igAD76yCBgV08kRmG8uHvzB64f+MDSuikHt8CxgXCnvMIfHzLq1bDd+54h7k/EtXKhkLb+48gWoIDpXKz5aV0inJ98HmLq3s9XrxZqFmd0NcBpZXgm6jdr9pbwzpEXgXbVu2IadpTz6OfJik+gmTj86+OlikqClNASk6Xrf7G1ttHl00vsR967uIO+BNSHssp0zjWI1QzErditDkCWR/gsn9X88AOI0= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4M2nLcyEDQjz5WYSqr6IYcRvGo7rNA//lX1gmc7FLUTp7DYY2uxY3aKZwQcR86//01mydaRBFH+BChVDwppO7v4uXYXUM+zU8ggXiUDHDiFihPaeYFgRxb3AO2nwnhNUM2FTMQOjAN5lIwZ+Zgs1xXjrgz7E8OUN1QfWCWGs3lfJp7BaS/h0FivQfOpEpj9xjTya9rqc8tiM9tV8+66dZfE4iQCOLGtp9k6COzbM1iZ2KVZMSDVNy0geqwBUHVpF/FQXKPgOI6RJCRUcFseJRq+7UJmTVhzmUOYO49cKoguVS/X0cOhgPOcHtNtU9BZvGrBagfj29z+OQ++wJKh8LT2om9MVYicp98tDTvAvvlgydaE8XaMk15612IhmoGFkvg9KXZotq8oqOTpQoKrnXfCqh/tm7NyJTSilN1M/WVsglMUgKgF+Gas14JWHprFY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rejvEuefH71Dfmt/kz0em0t2CzpXFqg08n1ACV1KV+kSYdrdjk0WMRlc0nsHfj1rfuEX5VBpxoNqD4IJxrBI4zhR+hC2pflKsGBTnw9mIJhw+ypPvauiSs3IfwFwO3xBLQwMKxuLFUnTaXMTpgrfGg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d079b67c-d41a-40e6-e44a-08d97cc920d6 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:29:13.3061 (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 14/26] avfilter/vf_libvmaf: 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: meSxwfndRiL/ This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_libvmaf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index d3e9f62e33..00b2661f5e 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -271,10 +271,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->desc = av_pix_fmt_desc_get(inlink->format); s->width = ctx->inputs[0]->w;