From patchwork Fri May 14 10:18:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp332885iof; Fri, 14 May 2021 03:18:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFDW49OW48qmVCHQKqRFkIebpAmoJ7ykdjzKHv/rF1vSrS+w2EWhraG44XROTQ0CtpZpzy X-Received: by 2002:a17:906:b03:: with SMTP id u3mr47323344ejg.381.1620987530616; Fri, 14 May 2021 03:18:50 -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 cx12si6407908edb.17.2021.05.14.03.18.50; Fri, 14 May 2021 03:18:50 -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="FNI/1+bR"; 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 88C8F688115; Fri, 14 May 2021 13:18:46 +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-oln040092075075.outbound.protection.outlook.com [40.92.75.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1922E6801D1 for ; Fri, 14 May 2021 13:18:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J3HrGpUEtNKY5kl8wjLazizrhnvv4JwdkDbtcSx/UKe3gBUyYKzC11whC05kskvlenL1FSpuObDJVMJhpkPnVydhXV8v4zRfJ94XkUNvIH9zWpl4NjXS4Cs9cAKm8YM/bM0adXmuYOMcyCasKBuu0oHeVb5x/WpnH8le0bohwy8gEocbzCycUoRvozwUpI4GYh75SZz0TTHjG+1R5Luk6dn/oJjITwlleQqvc52MlQk314xtA+6nQrmdMN8e+ebtRpC5ZeNloZWPIQSq+GciE6WeO4LpoE2LNx/ZEKo0v3JjPzFPzMlEoKr8wnvBCap4bBk4Al8fvZynrozDF/3qEw== 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=J/NP2HXQ1aSi9ijdntm/3l2sEzHAKpCDT+1FSKaWzIU=; b=SXmnqx8wdXHTLAH9pMkk36vx36HhxevZ/CoF4XJNHz0285TiYVESAngHRpdl4AjasA9Dg9Gf35Y5IflhLuCqn4GDC1DQJF+GTteOMLlhNBjUh97ngfT8Bf26V1SPmrAhklJF3mP8PpTvVVxK8Z6kujWm9SDj7FyRWwZ30oxsJIK8DSFRo6y5FLLJB2QyKL7twnq1ED5YQKPTLIkEmxGQCLfE/KE1kilNQfNzGt/2hCSjkiW9g1CgawN+ecTsVWVIdSQ9TfLcCAuIApN2PrsL6EfvLEJdFEQALcLJuifIUI2Byn3cb4r5QmY85YyipPRozMBOo9nsu4Mrn4IcZgiK1w== 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=J/NP2HXQ1aSi9ijdntm/3l2sEzHAKpCDT+1FSKaWzIU=; b=FNI/1+bRDhGSphIpSTlmkpKD8UMyIBskDVX/SvG5WoG8YD6dAWsi7lIzaW8AGFYpmKDWgOEGHPCP//SUe32rBpHFesobOPSeZY0UNil069uIDa1AOGpiKpYRSQQoJyFTDCJgtxFIW2pQd3dN60INwR7ivPtLk4LnCSck9DU0g2xUfQW5oHR2WddMxxY+gI6sbRh8rE05/20tL/Z03lcHXBQXAGufzH459tTEzlCFxpVqkM1CGmyAFjdEWKBdrSsQt+JHwdVC38rm2hLXQWUfioyztpmKz5VJ8qngxESZqSHnEyvf1CbJnm34RsRKwrP3CChmti+v7wiZLCXUatFzVg== Received: from VI1EUR04FT050.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::40) by VI1EUR04HT225.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::458) 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:38 +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:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6E09B42E1A67B388B0B6F9E66D39532F2008BA6C8BA0DB46BE57876904CA4271; UpperCasedChecksum:55E7752339EB5CD9FD1B67D6330E7F919FB14F949FE7C4B1CB230824EAFF7BB1; SizeAsReceived:7547; 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:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:18:17 +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: [DTxNGArYtq73zRPkiTktvCuRRqmHjMAFdNaEHyYFHJA=] 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-2-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:37 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 86aaf878-d607-45c9-d704-08d916c1a38c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQenZB4DUk7DgFdQYdnM+LLI6gl7BWGq+Z3nI+1zvHtBjW9x4Qt75rnvSCKi+9CxRYs9qIo/TqpJvBtu6lq6m5R/GWMC0sA/A6TJvW3M3cxW+s9z2eqCytv/7nDZtMT28XbNo/Bc4p1f1SyiiYWmUG7YWH0NaK/fwzEp9GAIqahrehQ3hDCL6VfefTnB4fRAyUoN2Wk+F2BwMPUld+0j29GBNyxCr997nyWxB1CYlsEOgfrGR4UzMXfAyd/te5BLi3tbRB2H44AjbC4X9XBkSWMJFuxsNeLWAaxj8YDotj44eGN3YNrf/bBphXow5WOrkiERGcgNMU3638/H11KLzSJh22ObCHtwuViqHZegUb9oOOqSHptyPD/OSdbevScL2WWlYtceCWOdsiR9AuvjUSrX8nG7xFir9GxQ25ZUAaylarMMtmk81/1zMoJ+FH8d2KOPsM6QO41lV70X5qLI+g6i+xum/86EFm+gIdX4f3WAFOimZT9b2yl6G3ODkxUI/iZdwW/L/x8u50zLCG8oNf+4W30sMo8QsxY99qOJk6yuS0GFnOLBhGIMoPpm5x2uDnshvq46+NfqId3KwPgGFn99XGDWz1x0eJT7tv8ICPfUjQs5XTSHW6dDfGKXVY0q0mB1XsjMcX7txIe7uKUueCeeFFar9riszf8iwAPzF12YE4II+Qn4zvtsuvnoK2qRIEWWEA9j9FoVUqbUhmMCH6FFn5Vhk9khD3L9GVZkfdmmVjpIVWSaHKQNlqZ+g2Mupg= X-MS-TrafficTypeDiagnostic: VI1EUR04HT225: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0JEToQUe+C6Rr9j4txrP9v1+OK/ZpqoSFdkvXOiJLMDT5FrfU9kqfp0MPXBQtAJZh3auAJqTzozokDNp+E2TjiDc4ZrNJSZEsOJgMa3QEdzILI7lpLdjLkYhf401XHXIRVLzgNp/N0+tdaTUfRtu7S3vIqcAY3tbT7pzeCP9nD5+w5WsKV5aOKI6mPwaCJX0bJWZvPne3teATm2i57ynPJBlvFxGhGXQ/ruhjsYmBhMWT/xKJd51j6U9qpXqCg+ny9G57SZXea0KeyUhWPyaBRVo9lovAH4MNqpf45UA6HRlTArXGFLgqCIOzr9OtvlUJKxjaNn1tf++MWr2DsV7FQ+cT8/t8m4JM9tMwVjT+rRqZ8S8medTrbk0DEZJyf/R5VqWXoeZeKfKhxpvfWaHcA== X-MS-Exchange-AntiSpam-MessageData: 9pGHVyd5TBwO5gXRXW9uhNUT4dlOvxkhma0hRjG+LiYH/Rtyo4EKH5PLTTv0Jh5bH4Qo3Kld9WdYFGjqECWgVPFRbLkI/WBNJZSSve4T+HUKtqaNtptvj5zOd130nasFAkiylRxqnukzdBQ4gqOwXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86aaf878-d607-45c9-d704-08d916c1a38c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2021 10:18:38.0650 (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: VI1EUR04HT225 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_guided: Don't free frame we don't own 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: T2Y4V17i34LN Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index e7c689e7be..e10d397f2e 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -329,7 +329,6 @@ static int process_frame(FFFrameSync *fs) out_frame = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out_frame) { av_frame_free(&main_frame); - av_frame_free(&ref_frame); return AVERROR(ENOMEM); } av_frame_copy_props(out_frame, main_frame); From patchwork Fri May 14 10:18:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp342902iof; Fri, 14 May 2021 03:34:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxVyqKzl3jQ7MKgTuzCTb1KT8C6iSvxnJ86EoQb+IzNs0g4M1cBYbqG8IdxcZy/MMjUJaa X-Received: by 2002:a17:907:7848:: with SMTP id lb8mr25961344ejc.494.1620988487474; Fri, 14 May 2021 03:34:47 -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 bw22si5767889ejb.745.2021.05.14.03.34.46; Fri, 14 May 2021 03:34:47 -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=Jaw24H06; 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 1D1A6680AEC; Fri, 14 May 2021 13:34:43 +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-oln040092075026.outbound.protection.outlook.com [40.92.75.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EDA9680554 for ; Fri, 14 May 2021 13:34:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEFOsxHymIz1GRXXZXn7Vm7GkJk5dVzxbrdiRlTdf1ScZ43oAFrOmIwUSuCQ7HLcaXBHiGZMfjDycO4eqs8i1GE1STbMRsat5IUWbBuQ2GOuvq/ysRNGlcOL4Vd10MXqveCk5aFUgAIhPx2P8lzVFs3NurWtDFulV+UiHrLLBhxBewlItGRKaTmMfYxFvGMQsryuOPpVz/rFZG1KnimiqvSXGX8VctTGdIRYHmvH/snYk3KGRVt1ri35Ivct1CE/zbCMikmvVk0LA/CMzzBR4xnh1gH2BZXQZ0WUWRk7h+cpzC48WoX1VhmzWaxIChBBLsA7uEf/5x7nxmcram2xmw== 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=QWLZHkSqw/wN39ljV3yCVc+pTspQ+Fxt7VkBDdhSrvo=; b=C+aB7TnIUqcC8GQqBi9Jpe4KJMWBMavw1Y73RkU8k0MU/bB8T2avbIJnJmXnj/4q2ITk9Kj1v2cci9GMrJ65SBLzxyKMAUT0xWUPIGDVmkaSsjWcHH4yUjAVY0DLTPtW5lj54DygBaX94D9UztJY01+mIeyAPKTI4uKqPEAFRVBTUISp5pFM0YMUUlczjQQBQ0dQkpAhEO0Yp+7MGXvUfYK4FZxIlwekSXqr/Hg+yCkIiNXeT+QCC9Xl3RxXVgKo7NfYIXIf1y8OMx2qkSkZXtmyF2C2JPLduqOiKMvdql+Fs5xPTI2QuRqCEf02UYj0o864EzISqIYaMLLqjx7GgQ== 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=QWLZHkSqw/wN39ljV3yCVc+pTspQ+Fxt7VkBDdhSrvo=; b=Jaw24H061w6QGN013+Hkfw39mc9gnBCt/SmioBJAHCIGhuZv8nwzU7BFxc8u+s+KAEPUAtNLVdVre3nCiZ1X+2ozoLkaF8dhdX894Vf9wQFOcO9lzyWUPBI4aLkZH9n/kVlJC5CMIK6WMb8IsmrdB8K6soHjIt6PzW2oX+uPCWmD2Qz4yzz+fpRaDzJWABMsNVAxOGdwNYcWTIkFnXL9hYm+g7aalDiF3aiE5pFxMTOs0Z8+nq6XNBhFp3bjsqRAPW17jMAGruWPrQqdfYxpJSqXSj114fMBSL2TDyuO+fbBOLx4jGMJiTDfjFx2ZdZdvIF2sNmne8R7a38Vtla2kQ== Received: from VI1EUR04FT050.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4b) by VI1EUR04HT078.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::179) 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:38 +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:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:525A516D9A19D0053BE818B466708B10EC3B90449B81F46C100CCE629B327E52; UpperCasedChecksum:69AEC5DD3737D422FBC00C2DAE992DA7FFB8BAC654A45F78EF93CCCFBB4C6744; SizeAsReceived:7537; 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:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:18:18 +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: [Va816OmfE1H2fiYOSd+Bka1CtWKFuSjkDJIq++TTJMo=] 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-3-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: ecb7f457-ffdf-4ca8-3b91-08d916c1a3ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVLplGKosAqB2vwsYMlBns2/duFcqGQAROIYrOJhiFZSaaDDZMJySNtAbewFRMPRD5OnKZBHI3FWit4/EduJvtqB2TS7MZxnPUNuMOhPAgtpi4HCJlP2lblJnQFG2uvbEGemzjD8Xunn/4xcHjyAxy3CHmLSjih9bjupV7E+ULlY1WAGNtMqP3B0gGpfp20a513fcZDZPA9YY0cOIy4g5Bn/AZoWrFpxWW88TOEpF3m2B445WhIHoBt6/9keHKdLKZMU5GKjNbJz9i60F4q/boldFnyk3a05/NckHWXNozbkACJdbDfN+CcWBNqM1QwnubmdpcPONy9ecLdOPKjU8iQFiJIFwjR8vqnFOu038EbciK1rQt5ZVEUSwSxatkYuiA9V6IAnsTOZwDyB7nvbdRLlb5Z3D0i/tH4Ka6F7vtGl/emvehjGxNXVjJytWbJT5o+Mll92M5JBQwmVuEDPErjfmQLfXxrXg39aA9V3iBNqodgUa8Cw+0wTKgzYE4U9zfn30w8ODAxm1+rFl5nenh4rEutS6aQ9gwc6KRNS4tgzWwjRdJ3Bh/doRNMYEWRRXijr+gW1HSIAsp+m3CPi0Eq3bybD1tgOpSK7DiSWAaI5ccrJjo4EgiAK38B7NpBNF83XrolBsG0FwUJQF04iZnNdb8Hnp93s7kEg4l/HY9VJ4QY2Xka5nDBBaNeKRetqG0haR/8eJIgJ82Sd69Qwk0bBJbgeVKxOHQ= X-MS-TrafficTypeDiagnostic: VI1EUR04HT078: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UtfNCNZAhLoUK7CjfjRnBSHhkVvlMJ2R0imAQr2SoWPxmD9Tt9mJNO4qYagKA9ZKiTTRZLF1NV6F1tqhEOT4oaUFkhdA8XlEJkQ2THXNeAax6u6W7kR/ghD6NpBZvb4WT317Hxr31GYNexcuj7h7rCNi+3n0rwya7DSUlav3gPZADSAvyOYS6tJC6ayDjSgRxMaU9tgzTE8T+AOVeWvfX0EvavKM9mO6vTlQZiOkD8HcJho/eGniMSziJAkjohGuZiL2PtolBoLy2XGI8JugDW/kTY1qxiUZLk2zH2LVjtAbPkJVkz5mSWgbZZDozJRkpQudZaGQ6+oonaEtt9/bhAUbFvH2tjjdkd9yE9ShigUkvw5UGx4Ilqu6g2FSoQN4UopGvjI1h+0hR3e/IqvA8A== X-MS-Exchange-AntiSpam-MessageData: O8f5l64QErGSCrd4T7ABa0t2kRa5KE/VVVvTf0/lHVvCYbleM1giXNwcCr9CRsbTf8VP+Osblhkv2L8xgmvfUPDgw7UVZyR0ZO2UtlQ6dQniRRIipcOjtbrYpz8uc4xXZo3oCjoo2eoNedoUR0/YCQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecb7f457-ffdf-4ca8-3b91-08d916c1a3ed X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2021 10:18:38.6667 (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: VI1EUR04HT078 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_guided: Fix leak of frames 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: jOL/cy6r1i8I Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index e10d397f2e..ce78507eb6 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -353,6 +353,7 @@ static int process_frame(FFFrameSync *fs) s->planewidth[plane], s->planeheight[plane], main_frame->linesize[plane] / 2, ref_frame->linesize[plane] / 2, out_frame->linesize[plane] / 2, (1 << s->depth) - 1.f); } + av_frame_free(&main_frame); return ff_filter_frame(outlink, out_frame); } 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],