From patchwork Sun Aug 1 21:15:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1050294ioh; Sun, 1 Aug 2021 14:16:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSvOBVHROvu4a1B+yj5wbtPMihUwYSNYH/9a7POOCsDxjE3lF44wZy4L6VDwsXzQ5xZgws X-Received: by 2002:a05:6402:124e:: with SMTP id l14mr16172374edw.356.1627852581432; Sun, 01 Aug 2021 14:16:21 -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 jw27si7684104ejc.440.2021.08.01.14.16.21; Sun, 01 Aug 2021 14:16:21 -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=Drfz2nMW; 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 C83DD68A71D; Mon, 2 Aug 2021 00:16:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2039.outbound.protection.outlook.com [40.92.90.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A08AC68A71A for ; Mon, 2 Aug 2021 00:15:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QvBmnzsGyP7Mh4Jb5poV2NHCLxkfhkPHgL/V5XHooTDvzqKWOaREhkMYpdnMaSeJB0+3hB443/P4HR1cLGE11+lZ51xsnxtqfAgbecNiYxkavTBVuoPrcnWHok9LhpvHTBWvGI9EesbQMdg0Y74ERWyzUhRm2/fBvClDRk+NRrKm5n87gSbtZQzWs7HBh5yDQG79DrwYoXoYHLnVGhqpOPtkUqwsYfL6Yh5SSyvvmRTt7f0jnbFveM893alX3Tkp6UzXcnesrWcb7tjlK+UbGp50A/TCUAX5YFfrfhPnRLLiGOtzAgyKj9bke5ZhYOj/nxWqFrmnhqC3r2CPqp/J/w== 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:X-MS-Exchange-SenderADCheck; bh=2aQOoowYw+OOb0TqQ+RVPcYSREkgfgY6OS4LO6QiIdg=; b=VEocfEkRzxjBfCz9UW+OnNFo1lY4BfscKlvcSXAYZOGO2zZmcXLosj3Ug4E38cJiVxgawNm7KP5jqe3nCDiSpJm39+z75sEiXqAI4/T/5i+XiVZDBpeSKfUpL4a2gl3eGFhzDN7xo/2b3Bs0U9ATCdK2WBukL2wEcpQnoLn5h79jXf0KZQW0uWLd6gNIUnps/OzcWz0X3KKWNxpHvwriqAm4uYChEArqY1+C9QWyuk0OTFiSeEbJ8NqpR/MKcBQ5I0szJwzAlow4pDWD4N/TwrKQp8vFQiq9ZXn9YVCqzOryiisXrTwq8QIJSCPSPyDzvdaORSZH0I6fTDjz8krg6A== 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=2aQOoowYw+OOb0TqQ+RVPcYSREkgfgY6OS4LO6QiIdg=; b=Drfz2nMWFDxXolY0V/zEucR1GQo7CR0OU7dW7hFxQyVzr9aZL9mf4nTYByRHt2jHT9Ujq3wJeW89u2Q275Dfo2Zw4TBqSkgTXG/zICRKfZUYvxNj0XFsQ3LtTRYcbNdHGCjS2+lVCA0ElX71OaC26z6kB8pT/cFcRlWEFgMcvu2y7yZv6eWUnuC26UkZakok48VOzJqidh8OIb1hWeg+TD55K7huaFiGwY02b5FmHCsaf3lCSn1cLOxGkX1z7ky2szdXQKnjFAdiWBRI1vfg4KccbNEn6odPsA2V0hVjy2Lz5565RbH/vv4JyWoe0SWVhIxz90FuvbfkMunPso1LrQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7301.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Sun, 1 Aug 2021 21:15:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Sun, 1 Aug 2021 21:15:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Aug 2021 23:15:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5zZk7jxsY4wLzN9zfIMRQZcoge6z+eOA] X-ClientProxiedBy: AM4PR0902CA0022.eurprd09.prod.outlook.com (2603:10a6:200:9b::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210801211533.1005556-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM4PR0902CA0022.eurprd09.prod.outlook.com (2603:10a6:200:9b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Sun, 1 Aug 2021 21:15:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2aa0ec0e-6f0c-4ee2-8cf1-08d95531893d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRC6LfFJetu3tzwViwha8R84p5U58sl3DAd8WBpUYpRa5nexCof4SM7qpbI1nXEW5ebruqOGTnGv7MkFYqS1WXg4zQiyVIo2/hm9L4D3YHdt4mme1ko4/vKqvJ8KgRrVgtLmh51CW3h2+b4VNWALT+zZm/azqny4MYu9NmfNeMgHs/UC7zmFUhDvGJijwJKKQp84Uv5RRi+SvajBk4+UQcfxN8nI3JHngOpo04uoODvda2g9XCrQOcubLdXfUxJAyHNevzTIhelPYt5BWJOYRuHkXHxQUojWI05797s0pg+pVROoHHioG0P7Zea4suudW3x5MaaDMQg2e9dhEqx7Qr2OjzUsSN5G1JPIucQ9haDoJ4F6NMkeS0wBloVL/fKxOCT27wdekzUKi/LsSHHF0BtFEccHQUOBszu+zXn7kC1Qbrlil5zdj7K72iiMntaeMgvaGjLD7eR/v3yxUjNyBRJ/OGdeG95qOwvjTeuprkHK+4n6L2thQ8DR0J42EYimBSLYnEK9Dm4IUFn4raXqNDAfhLWeEp8SKCPjcjly1v6tacKnoTcnX3FFgwLzCZPMJN8bTcnaiTmo023ESOEixeaVariGisHFdHjLOvj88DI3A1wIRmnLWNWI0sx920O6zpnOCzoPS8uUqzaTHG7vDgWzFS8qFu3PSzP9P579RspHnjn6m4sw13t4JaEiG7+cNdfQTMimuKy3+0Bj1BNeL2mI7JygSf7V2BoHvh2QjOkZbB8iPkqEWA7PnAU2mPTm7w= X-MS-TrafficTypeDiagnostic: AS8PR03MB7301: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dMWVYslIYo1DQsmiV2wN9uX86ZqwPUXS82fB5zrGX9FoYFTEqO6QXdzHMSws+rhpEWKy4CgoLNhG5Wl9WJu3iNV5/cEdcPjqy4/188Y6tlF4ze5q2ow0Tm9fsHyLtTYHJ2gg4oP/bERfwDjbHQWMyGVvdrMTlHjrU1g8QVYxRgiL3nly3tlwEq2GYYhg31ZS2SwcPGYfG5+1iNTRPWcKGkWT1QakHPRBRSz+dz8uaWC1MlnuexZtnMi4EqaxzwcjGOTXvUhzr9Tafol9xfFgrW4Ng9wq073lm9hEp6HjEGLAYSVCAgKByl7g/MUYzYNmSN0BjSb31TDjAh6BfYU8wio0IstiyIbR/bLlZEQ95qHc51AMzMgfLcaPgowHIoOEKLjwwstFlr5QCq1hRsJgg7OlbTOqa3JT5nFCXMgVKMjKu/TcIHRSo7XtgvKLmH29 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ozzvbuw2MvK1TAqFjU4yAJed4hoYeNTwscLPRs5hurp/R0p/A/o2wgd4d3dhePvJI7P1eZCB2A+9ZeoPET0ri0aRQWIpbqcy3BJbph616NhCfvjnxXFHlx0fTZKU2iGC6RgLWORjLXdydvK3wxK/Ew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aa0ec0e-6f0c-4ee2-8cf1-08d95531893d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2021 21:15:49.5758 (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: AS8PR03MB7301 Subject: [FFmpeg-devel] [PATCH 5/6] avfilter/vf_colorkey: Don't manually make frame writable 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: aqW4UfISVrOS Instead, set AVFilterPad.needs_writable. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorkey.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index e0b4372842..f8b5c80563 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -135,9 +135,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) ColorkeyContext *ctx = avctx->priv; int res; - if (res = av_frame_make_writable(frame)) - return res; - if (res = avctx->internal->execute(avctx, ctx->do_slice, frame, NULL, FFMIN(frame->height, ff_filter_get_nb_threads(avctx)))) return res; @@ -185,6 +182,7 @@ static const AVFilterPad colorkey_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, + .needs_writable = 1, }, { NULL } };