From patchwork Sun Aug 22 00:47:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29707 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654367ybj; Sat, 21 Aug 2021 17:51:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/f7muwBGFU6JrcmtBN92iJAtBUvdoAat7EqWumuZmrWq6Y/9bS6v+PLN0ByS63IE9ePo8 X-Received: by 2002:a17:907:101a:: with SMTP id ox26mr28825197ejb.282.1629593498002; Sat, 21 Aug 2021 17:51:38 -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 eb13si13432544edb.405.2021.08.21.17.51.37; Sat, 21 Aug 2021 17:51:37 -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=PsIqe+5M; 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 8951A68A473; Sun, 22 Aug 2021 03:48:39 +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-oln040092066050.outbound.protection.outlook.com [40.92.66.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77CF468A5DE for ; Sun, 22 Aug 2021 03:48:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aslzc7SZL441HG3SoaRNZ9yCprI6UzGLIF6wHTn9Fb8UTQ5l/uUyWiO5753ONwRc7nQvNOEU1QqcCWWBrOpmA+nthNey4AkqE2ZcyfLmsyVUy0XOr1/LLnLnmgzDGVn7tzlX/tfpHUut/jtzNty8bgiboaH7HqUx2gArMOoPqp7ew5+oLi/e/z3EobnmrrZKNip6Di+p0DGQ3pDDfTo+LnKdAVbfNokEIJ4xvHLl884xFxBZ42hVRRarFGEhIlwQ1qCd88utw2sjoIAmYwYijnPxlAGb5rqvcqcFKtb9MKd5rXWaQjm7zHUTm/NhHUjifD3h+o0Pb2HI1dFk0V+5sw== 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=A79aTKyNTpl6Ba/rY8I73fZQIWnPFMZpI5VnHxwIP6Y=; b=GXLUvvVVMRwxvEedGxZudot4NjmGDpYZOAVcX/Fo5XicZDDMMQdBehLiLOBQLpugrgxQMjU+CO0M3YJPDDOPaBMsi/tsrDu+PqAqJtUWrvH7SsuGFfqZGKtyE8r2oSL53WLVn5fzSm4SvmHDjiH9DmF8QtCFgJacOa+t3biRyc/hS92CR/uRfG1glbIusQeb8lWWKQ1bNdnaswUdqdcNIIPWMN2e6ReQxWxLJCHS3C6k6YcozpxrZr5jeWxwf/UZ72fpZe8tehQQIPjkNw0ulGrnvUZiSo6a9RHjS63PA6aWz/FouUtEgH4xrSyj/CPHrHn2+e2eLj9Wn30HMtiFrA== 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=A79aTKyNTpl6Ba/rY8I73fZQIWnPFMZpI5VnHxwIP6Y=; b=PsIqe+5MdVd/p9cH3L4Emqqc+Nz1mSlPR2ilhOzxkE1mSIbez77ER9xlzOiah77QfrbNIFKfDBwyEvYXr11IjAV/C3QguNHILm+xwHpnBKk5KSNtsRgSgOUqjdxzeC5tJud9dvGUw/y4MGdmVPDRytMoLd6UyyCAMbv5trEBm39LjPZn8YZIW1hfu35zjRR79loGFsr1GCzFUFHmGnX1NIKBg0P/+kpmANdVqLcB5XRMu0MpwXRAUxR/DrNtUBqTDfHTHSs9Ppl6yLc10FPbYas1SV/lh7I0ZpOBgzU+OY3YPOpWRZx6r3CW15xSbxvDkY10lotB9aKhJ348eh/MbQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7296.eurprd03.prod.outlook.com (2603:10a6:102:104::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:33 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VvZwVPEwet7BihA2MaR3i2zFZHcGFHY1] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 678ada5e-f9a9-4580-fcfa-08d965069161 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hh2QjJlHPtkyJBKXWcWcAT1EKcTEQj53YqeVzJnnXl9cWNoY32DNrNfS/F02yLdQRmyUkumkdgGxRXfk6QfAXgosQ8LJwacgOScmtMIEqOsQTmTtmb6g5EFVdIAmOCIa6L1p9AfIBb+18xYN/Cwjn7xJ99B8D0y+udjAUBdCwHzcbopOrF5Gij2ZeAZX1Wyvc4R/xnAxus0dgNxPFXy734VUZ2e5TliWEX2IBbWxw2+V9Uc90OKp/3l6gQmNxBgNnVBYqviZC/GnyPQR5bc0PNSv9rGbnPu4o7Ldv9bE7UZrQHoMCSZ/JL75w3gO5huIUwifK7fG8usD0frAP2wbVPeF66c4qDC+8U6Wzbi9Vh54t7IIxMu1NI/lxsxex8diUdII/iNOydwVWOBxKAe/njMp0PYtRVeIzxnfT+DcZ+ED95MWXDJ0r3ywivJ7f0+NMZEAc/Rg48gCCcU28Zlmtw1CrkS/yiSbB6ftS+/xXas8p/PoXROtoJZuSeY5OFjSJC+kmab8tFtFCa3U24cRROxPJGoFnbqkf32JE9ZsbiY/7t3S78mdM0/xWyi1xG8uKsO7TyH53yubSEB1NisIrpt8EBxdocr/ayG+22hd0jhgp1nzdgz9uQ7NfcP5odlnbmGBrSeVsftqRRr14qqTsrjbeNPkgn6JTvAOp+HBMOJJi81BUlJtEwaPaCZ7SGwh7chYD3GYdKDA= X-MS-TrafficTypeDiagnostic: PA4PR03MB7296: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UBOtu9TGphVhwbJwrbebPi32ltG4qxT4cUzQhjiWzNG8GpAt+HUIutBjjLBr0ztN5CS7N3zISon+IhwdqRTYnXa/YsQFJThJ/zO6rJDZpgjf3ycBwiGM8/y3L9d7XbPFM42GTig4AbQZMiaM0m/VGLH8kmlKLRaeEJiL3gLDSj1v/lpf2c6hTHYojO5Wcql0EacqECQOmGYoFlI4HQe9NtrQJuO00+TH0YsRiKDlsOlOdo46+P3P77pAiZ5DMvqty75HL1z4eOxfo8AtVfuaTXjYFKDMqscFoFSm7T1qwN5/VM7nmiAg32m7e8xbyi4EecUaWOP5JXYEfAzpKhIqFUSVW2wOfvm8XeEPwJpBfwNkhMgVIRjoxLh5SyzbLMT96iGJZ0xPmsx5Kp4SDYzBOhSMSRigcI07TIujCHmA6uYSUFkTs29E6AAIXM85L2mN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pOM4FVZcLswv/+/ag7762EKHgI281APYrdiWihJE+2Kxtt0V1XeBGlWwBDapO71NwVAHSGCCrpqWje09M3M3kZ6ZALjsG8P7AVP2iLzVWCQD2B855fY6eH7JYZqmUMuClLq5gxnlzD1kDrYayTBLHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 678ada5e-f9a9-4580-fcfa-08d965069161 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:33.4924 (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: PA4PR03MB7296 Subject: [FFmpeg-devel] [PATCH v3 24/25] avfilter/vf_xmedian: Free inpads' names generically 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: 8WaXivlZbb4D Content-Length: 1327 This affects only the xmedian filter, not tmedian. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index f900720012..f8e4e4adb2 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -118,10 +118,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -335,8 +333,6 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); - for (int i = 0; i < ctx->nb_inputs && !s->tmedian; i++) - av_freep(&ctx->input_pads[i].name); for (int i = 0; i < s->nb_frames && s->frames && s->tmedian; i++) av_frame_free(&s->frames[i]); av_freep(&s->frames);