From patchwork Tue Sep 21 06:27:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139335iob; Mon, 20 Sep 2021 23:32:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyd272KXhG+hD7+lVtZ6pcQHPpiNQcHdivIDWxOUbah0GIBIlVeBdv9UcYmpLn27gTBFR1y X-Received: by 2002:a17:906:6c84:: with SMTP id s4mr32867941ejr.121.1632205965190; Mon, 20 Sep 2021 23:32:45 -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 b88si4656348edf.312.2021.09.20.23.32.44; Mon, 20 Sep 2021 23:32:45 -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="J1iUn1p/"; 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 DA37E68B218; Tue, 21 Sep 2021 09:30:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D521168B055 for ; Tue, 21 Sep 2021 09:30:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVPSucXhOi5NW5/Z3xn4OgBv2tmyhEOzQjiItDQNmR5/c84P9+CAmmXCavt7C35Vht52YXp5aL3tDuMBRJWZTBEyGP/NTOaoBVQ6KWzcTlnrHkWXKziPWIylbeim45w80zOb/xv5Xi0R0y3fIXFfw0qYqq3yT81+tnQhReLEegosyDbtYG9GYRPCAFRwoEaVy0RvfqreWusl6oGSpdGRbqsA6sxgAwL2WdlRLaFP8yrrxX8tsbOQqhVsnQZNxFRKRoSmrfkln6GsiCrsWleSiZ2GzRLEVp1QdRC2K7wiJ2F41tNuGoE+gjP7+Cwzo/6835hglUjxLFgKDuxxew3o4w== 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=Py0iZZo5nst2KKJKQU0B2uLP1lERBm0Hwia/88jM8Xg=; b=ZkGqyu7iOKi1FXd9Cl9Q1jB6gnFM3we1tv9kLcvleQGbL06Qb7042Dm1yF+z61zUvagPF06SX2XdaYsBkYwhd+9kPHTl24NPLATbHrqovlLx3VkZPFM9t26btVzig8Lq+JoR2M+x+d2q6L8uZ0RvUXi/uks1L9ttsp7Oqt4fDEOSAy6pB0tA1i0zvsQXPIEzJXgfT8C1qgDFdGBjRuODUGFz2CvpdPmEju95CrGyJ00jlSc4Y5ZK9zX7UTC+B3EnB/2Mt+EKze3u+1zQWLFx21uFxtZGbIi0f5fhCUEbqDC7yxiSALRtiZHM+AuKhqi/IXeABKyP4w9KrfJJx6qEAg== 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=Py0iZZo5nst2KKJKQU0B2uLP1lERBm0Hwia/88jM8Xg=; b=J1iUn1p/lmuDwbjC+zsezC+eEnx4OpsNcucVE+/82jfY4TwNlpbOnmgyTCfOw44LWOMSoGCn84AicT4NBt8dRa+bs0sV8YH66nzWR99RQfC6U0vrgUJgSP9+PdfvpliV2HLbUyEf/RmVv/CI8mc5Z1K+65i3eP9ehwkQOmLdYW8zjMWi2t2P5q1sDakqZ5CebLK4ji4uX7cE3zCixNup40fOQIujbhk2UnOamK41kqG7zcQURD2smYbrdMnyouUb1N/nyaZQWs484yzAVZy5c9F8t0sO5HoeMVT3Aj4+7SlojhjOaqpDCazr9ROKhhbTT+6xsqlYHax0Jfh6m2GLAA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:30:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rMmWJqnyFY5uKSUjvWkLSyDpjc18fWZS] 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-24-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 781b9bf0-3c8e-47bb-e49b-08d97cc953e7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJoyQtms7J4Bc21iMwDZgH/tyPHK6MTYqlKihDlkke8HdueddvQ++qw8PoSRaVNGWMoPqqo0omVEm/IpA3jCC8TMkgrBcRKts8dyIg1Z7mzb2MPC+3GGNljoiiV2XZq897LaTK4e5tSdoa+cXZUWuXZm4n04V5neNRoYgDdhTSl4a12960tMSI5oKbBSPJs61S6l2F1Vl0IX7DAzYDbwgFVU8HEBdUR/YLVB87QM15xSQttXsC3XMaspm5ny3kaXcVhEZQ2sBNIBpxS9/QX2xapDgR28WCfWSEXYFKvVRwmzr0dYUp6YNaTB34cVW9SD5VIhzLbQyosPyvqcKuKi+wtBpGJa6S6pXJu7WXTy2MEq4aI9GIYsHZXrIr1MNZF3khrD2xDypo1UyZR8uOiiA/zii6clgGuUGZN6QWg/AGGYBvleHOvBz8UI54z5fG18jIsEA6eHSRXBpB2VnbpS75jZWVMB+OBoaJ7wvlj39PHp2CkwNs/WMPkl6T6Fg5EiR4WhlrGtOxsi331wi2fp/HFbfdOkRtucaZBRXJL8Ucp5CI24ngtAvdKSnyJvmlCLUvrpUhF2tyGnqircP4C2M3Eu4p+B4+W4KflUslPuie2PtlgY8VVqG/0CRH/losefnlxoVnaYfJdSIABMkJB4y1tBc/b+Fxpv/8m8HC6LZ3+zkC/0YnAutPGldZk1DoON95I= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TyrvwoG2Y3OFwh4OhMfFQnAlQ+tEdGf/YSMT2fMUY9AG6B78lzxh+Y1ckwNWwjvNspFRRWiY33TRx9PEplUUhafzWB5VG8+imfpqzcvrBSaCfbNnsPLKEuFn6+8uODqifhWwav48KxoS2uBIbP+oogR07SaBrk+Wbb7in0Wx8EN8ZtXOGMeBkvqy/Jmn7P65vwSZ/WsUEoKejz20BXpP1sUIinzekvfTv6L6zqm/VcR7zIc0wE41nEcmXK7n4NenJ31kVK2XTCH9TXtz90JlrufgLKKxe/50Jx26Jrf3/j3dZsMKA/OEeilHr+/+c7gjY7+hnV6sg7ZOTCXhErf33gYjgIP9MZPewuZrH+I6rZ75hMhAP2wW8/ayvXw9IIluSoTzGnHwKBOTosrRrEzuqTkQzEPTspK03j2fqLccj1uFJzBSu+Yd5VtA8b2af97W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hSCoPDd6WKQ15Pyn0cRWu2CXv/U4myS4mI7u3RAZ2MjVxf231l38y5ITGguPLzMil9NcxPd2TRhA4xLy8kTl3/Mxq8XNho3kaI5s4WcNG5HZoNdfcpSVDmDLGmDaz5gCoF5TrutCIdK0i8E/z59MJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 781b9bf0-3c8e-47bb-e49b-08d97cc953e7 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:38.9962 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 25/26] avfilter/vf_xfade: 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: OIEjQJ7PjgRS This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xfade.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index eff8a8b854..b4edcbf1b4 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -1717,10 +1717,6 @@ static int config_output(AVFilterLink *outlink) XFadeContext *s = ctx->priv; const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink0->format); - if (inlink0->format != inlink1->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (inlink0->w != inlink1->w || inlink0->h != inlink1->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " "(size %dx%d) do not match the corresponding "