From patchwork Fri May 14 10:18:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp332978iof; Fri, 14 May 2021 03:18:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxT3eWDmLXsErhO3znUG2yAejWynduGxDcJG/BfjLAyAMpy8pwdBAQZP61TiO01e5sQeNjZ X-Received: by 2002:a50:ee88:: with SMTP id f8mr54327911edr.176.1620987539761; Fri, 14 May 2021 03:18:59 -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 i26si5332064edr.106.2021.05.14.03.18.59; Fri, 14 May 2021 03:18:59 -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=OdfFQPuZ; 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 8E12C6880C3; Fri, 14 May 2021 13:18:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 562736880FA for ; Fri, 14 May 2021 13:18:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lC4lpPAw/JNXNr2ySAaRkNVF73Cx815CJpiaKKF9x9XO/GgdqAs88/dA9OVXuWVSL+mXWFH0XNvWBrTcLfDKkqfIchLEHYIxbF1LeVX2zR4ogAt0RbItQLuExdnvWzkhTqhAyEY+swHMDi10tpH55ZvVhMhpOlCDeeMAEXqpKjA8eJnCbyQ9unPQKzXjTB5dzQcgLcnUgjRaZn4DnJVE55XdxJpXGILtOFU3LDrsNi4+xc+75nPiZSiHmTbm8p0MWXH07V5ajOaJphxTpRarHjYtiXFYy99/nBNlS8KTxpPk6F452bCoSLxslkZ9IPbd88BLUVAz93HJnLdCZg9RfA== 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=CBOM8ewtm7jXFPiWUE/tlZcML9h4NyC5Ze0p2d1V8+M=; b=Kv7KeNJqE34yndqh+KNW4oTKDOof1rH4LUTe60ZJJ+niue8rs7lWLGYHGjLU6uH+941BCjUvZBgfBLtOIuD+ejq0gM4KUFVT5bglGI5rvUGsqPp1GuNw56//UpoAX+Rj/adVW8G4I58hP+2RqCysdReyw2zUe7u+unZ8kfuc5eJPUSH3jPO9jWdvlAWb+TFea6flFMvGpkYyp55JVTP4yvxgyTWyQthhZ0OupU+EmFLnKuryxX0UJhh2OAA/Pb4Je8scOc8eqfaI1oRv8l8OH3wGc2j007lhhMCnJRWhQNbCO6jXahnBv0Af8SJDKifNpQZae95ebIxKo1VHkO8xuQ== 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=CBOM8ewtm7jXFPiWUE/tlZcML9h4NyC5Ze0p2d1V8+M=; b=OdfFQPuZgjYuNFXThdllRMaqfp0R4JQTljLYCYkWyg8camIeHt0S7a+EHBO9fcGv8M/945D2mnX5WZ7IsG2glaI9j9POEZyEt4NbJBC01sB322gGflvC34obyVQcUiMtul0CbANDwDRmdyS5vL2Kx1dIL9jODwvlLHkMXgcQEqbvpjGVu/SW+rEeA09BDm737LbGtlYFlCzseevhBj2JARSShUIjnHkoCmjwsA4rNAjOFXHHRLjwS4NQTDpZTbDS6glXVDvInhDLEesyxHR21s4C90ULFMK7DjJBUq7yJSGsYFMpc56YIqZXmOqLGTP47/E3U5iBGIu0q6MpmL8EbA== Received: from VI1EUR04FT050.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4a) by VI1EUR04HT129.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 14 May 2021 10:18:39 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::49) by VI1EUR04FT050.mail.protection.outlook.com (2a01:111:e400:7e0e::369) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 14 May 2021 10:18:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E2C530015440C789C735FE61A208716F7998459CCFAF24554632ED04140B55C5; UpperCasedChecksum:BD3CB50FED076610E4A9AA05995C35B0BE9D4BCB22696729BDA8AF71C1F3CCC1; SizeAsReceived:7570; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4129.028; Fri, 14 May 2021 10:18:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:18:19 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210514101819.18048-1-andreas.rheinhardt@outlook.com> References: <20210514101819.18048-1-andreas.rheinhardt@outlook.com> X-TMN: [DiHlXMBKn3c3c3N29lT5bzwIgCqC7iruROTP0pkr8o4=] X-ClientProxiedBy: AM0PR02CA0105.eurprd02.prod.outlook.com (2603:10a6:208:154::46) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210514101819.18048-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR02CA0105.eurprd02.prod.outlook.com (2603:10a6:208:154::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 14 May 2021 10:18:38 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 467d6874-05ea-4e6a-337b-08d916c1a452 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQenZB4DUk7DgFdQYdnM+LLqyi5ZMAPuhdyghAKHC6sON+hEaziPkaXUJL91OC5wdidl15HjZUHG5GEoIsQaX+fJ3u4PRnnIIwexXAURO+qO28BqabH06y6Qj3vRkHnWem7bXXz0HJn6NCHC7E7+Jnthlh1dTj6tDGcdWrSTLbr5rdSm0jn+7z4mmoze6Q5+qK8RI872wwuLMp9NGOB8dMfgTRL6F7Ez3WoJr08jcvHhvS0PddY8dObxlyLgoUiDWGDPvdEMJeVRl5LsuqHDEYrJp+iu91tSgjsxm7sKHULpFUFMD2Ar9LJolGTNkhRMiPDWPsYU8PWFNrUp6GfHy5cYkwVzulxCWSxH1573zgU4DEQSnPefSHwA4xtwhpLpxIZDXyGaPnQX+V+xRuGLwLdDwgbYr+zQcZEpQKIucdpYldTobBx17StlMn1QbwnO+HBSaQtgJDsThvw0Vt/rsaAU/aTeQcE5M5GeHQgDj2X9VZG+VyKoWoOsbY1xxxYZPQy4Qbh1o4A1okoZfCZtfE8doZhidLYbHPkL0DW/BBzLZnh+uhA3EHHEtC4eXPFEGyli0X09PIpYmbwByN6Zlef9YPySnup0qqJd/oX/ZglJ0Wd0L5IVIan1u+Dkc8Oavq7iirma6dzHID455CJeAcxWeBKxL59nIP3hkEB8k0wstMiuQi0E9iZu/nIwYSAWhtlOLs+ZFNxIj1XGYI+ljea0dYL4WOkGuIEiUPUdbc4pNgAx0lmlH4hP+YcJRCCbO0= X-MS-TrafficTypeDiagnostic: VI1EUR04HT129: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rGlc8kFXQggwB6LiN+kfSawtiIFn2G229+zfmAVw+FZ+pmUOO6Hmn+ol34lAxP/Je9UdpxKSsB8zzYkW8a9gLI7a8PrrJIPl3aSGE+cUkG1tRASCsHGaHc4QfZlOVteYSA9rEyKHU9iNMXPFwp6Q59rvQpO8WDYrUzQ95D/O1MLQg/GeLnO4sXseUMgB5J3GxXUb9alIcGSdEqlqL2ID2EuG3mJrPDMcQnEY50TV2q5ZM0CmwasAeKOQPeHy7j9L5nNUf4OzoK2Ph3EXnw6o3PKnC+SaMIlZZ/YV57oCi9hvuPZphBy5UQ8UCMLxEEdDpWoN7d6+rKINFQnt6iBnwnyWOisdoUlGH4P6zUbh+YeqC3+kelZSpPOiLnArTh++ytNUYHAe8v7SXUijlXm8nw== X-MS-Exchange-AntiSpam-MessageData: kiAnHhjj23V6uqD0uGijEnHTuy0N0NOjJUKnKBw4xC/ShVTpwQIUZbP4ziabV6ZtEOM2fspIWSxVQROb3lo+8ZjMxQfyedKfPefWrpGXwy1c0mMCg0UKWRi0MLb/obbu73mFSgnZuQwFo2t3GtMARQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 467d6874-05ea-4e6a-337b-08d916c1a452 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2021 10:18:39.3674 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT050.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT129 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/vf_guided: Don't needlessly copy properties, fix potential NPD 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: 8D4RUE/ZxGV8 ref_frame is owned by the framesync structure and should therefore not be modified; furthermore, these properties that are copied don't seem to be used at all, so copying is unnecessary. Finally copying when the destination frame is NULL gives a guaranteed segfault. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index ce78507eb6..35c518320c 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -333,10 +333,6 @@ static int process_frame(FFFrameSync *fs) } av_frame_copy_props(out_frame, main_frame); - if (ctx->is_disabled || !ref_frame) { - av_frame_copy_props(ref_frame, main_frame); - } - for (int plane = 0; plane < s->nb_planes; plane++) { if (!(s->planes & (1 << plane))) { av_image_copy_plane(out_frame->data[plane], out_frame->linesize[plane],