From patchwork Sun Aug 22 00:47:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29695 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653383ybj; Sat, 21 Aug 2021 17:49:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrqHrhZ1N0M6tKq0WIJaPdemBTfJ6X5XyGR1mpVZ0nzYRsHMUAeAxq+2pvXyC9bN0Xr811 X-Received: by 2002:a05:6402:1395:: with SMTP id b21mr29413258edv.119.1629593392690; Sat, 21 Aug 2021 17:49:52 -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 b8si9516062ede.140.2021.08.21.17.49.52; Sat, 21 Aug 2021 17:49:52 -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=q5BaWpjS; 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 D540D68A544; Sun, 22 Aug 2021 03:48:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54AA568A33F for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aecmp0OL6T2pedIdnEJq6Pq2flxfsEP+2ZtaBC+5YaWp3EqKAY6dSB6tMgZLFdT4KpimSwnfVGaUZNq7iffq7y+A9BF+m8m3+kPNsxdSMFFGZ/TPU836lwbtYkBixlCzuJj1jodPWcrFeDs7jubvZ30yqIZYNxYAVV0g6C3FIn45XHbSB4wohq8b5ER0TXszEIbbarliRr/1Bqw1e5p7e2qm447ybrdUxpvaJ2EoWGi4rUrYslpJB4Eld9fkq/oUM332o2VtsZ7Jr67e9FM1iGhX/UYtZn+YN06QJB/Cft0Qeu1hE3Dk/g6t6VDXLsDpR7D4Hcb6SF976uf/P7EYxA== 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=0K4/zXwwECbzNCPTycxTThHtPtbUa+YpDE+ic/GPrBU=; b=MHePOSkRaCSrxdxJ1Q0ljkmqCwVZgXKg0ck0BEIxoE8jKoSbj06bVu8RRjIHaI3PZ0y5XOHT96x914hhVaKVo1gsFiSRIy9SPPGyQncWg9sLgnX/a4LXtdssFZCwHGDKKnaEu4zwyTdCudajb3HkuPxuEPuiYoijmaG98AR0IwEeSLOPrhpjeEgkvqrSfaRDOUw6Jy/pfDbJM2foMm07udFHE1NM+72NVd6QH7GaCkcMxFmGStDXA/F4Ad9A+YES4fgVAZ6SRC4BdWbTxPN9aWSRtViSM03597p8wHg9MB2m4gCJYK7WOGpqZTFB+e3Elb/61r8NF5sPC1SY/ufDxw== 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=0K4/zXwwECbzNCPTycxTThHtPtbUa+YpDE+ic/GPrBU=; b=q5BaWpjSQJcC2xUTtvo6voJGjqDfjGR1N1xcQho/bVeiOT+Nq1jL0rO8Tan822/uzi/OeDc7t6MQ3GdPqb8slpGePFUY7tIcwSkfaakfq1OnTgn4YbW5x/wvE+4ZE08TPTUa3e99qW5x2VLeUWMqgMLcpN76Shafp6mikZcIHeC1fgKEZ4JGt8SoWvjKZygX2IxagYzLahBl/vRQRlUZPM7ySQGhvx8oBSlTIgvypaWPx0ID2y7BEPDN0wlQiTMHYSS9tftTTrjO16Buknh1T4HM85qS0MahmY+O4+NzZd4Qxj8F9wMGdMuRDjbjK+/f9JznLS/TjJ8xpi3UL5SAWQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3I2cEOsaonsys0S4Q6G9qRTtoLRLHvZh] 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-12-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:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de367db0-8d76-490b-091e-08d96506857f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoouzpqafZaBwZGzGK+5qfOlpIue7SBnEUsZ53Z/dN+IapWr43F0Fvo1fLq6pZG7CmN262W/tikX9HLNoqmUD/AqCkPnCLAqpc3ICFrofU5Jq4v80D2sPj6d/zJnTR+DTE42dXbPql3lEbKARXnvZSwu2n9eW1b39YREcwaJOMGa4B013RNArdUw2b97/VRNIcN9dsyqMSZdkXYEJUgef9aS6yRHPSxAXHA2sP/Ep+VJJYWjPiJz5EdLNhWkiJeZ2rAI9GEylrNlB1lD3LzFJrb9F24eWVQiWd/YkpqI+TxicqiyypkpbmO6Wu1HNqffzKFrnQCT43tT6iaSaXu9Ly0QUW45xgZbmGGA8Ih8rz3gjmMTNheYJ/MsnIIY7Jw1e6gmZvmAIy1BOssNcp/2bDFcfL3vv0IDnVWNmgB80LcmBRnELNB2ICZLcFvsXpEyEHA5iRoAEXBEt76oBadoTs/8LWWWEAh4kyCwrzRx20VHzGxhRvnLx5fM8En70dhoS2+pn+34/36NQZjH2UzTem6TY6nYPZjn1NhnadL0p4RHOxmqQfeR/rtWq8S/MP7oDn+SJ3asCKY6c/haGnfY6Fc9h/4xJ6IVNgnygVA0hW9+EEIsaAOPeNyzBYnsuV8++BqhtnYUXqwj7NP9QBKfhAC+HrrfBSX3PoeJMt0lZT2wXbHvqfUumnCuiibiIiCi8FFOywtpql4GD+qmzj73zESQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1Lbr/JgsrzDXKOZiHbSN8GuvdCUwIabVW6LKXLU/5/5XBYP5Iaz6HDR3mwsO21WdGD6csD7S0gFP9WWWSSz3E055+ymgIGJQVGXbzk5id/TeJeElU9A+u/xeuCrhsIrYx2KGa9VJb7uucxFTm25Og/+DNgPh3PJ9+v9IVxg1GaodKjSmOuTKBI1P7ZwYPONPmVnvv0L8X0fZgKUabVLSmcp2CXK9P5zR7YG0/wTMsU0m3tr2BNT/8l2SvH8knB92vfz813afXte6/HDBiCn4EgWHvEmCwXEf0z9q/o7bUfhnHCeIJyj6JvRSlCDkeB+RDjlOoYWuApsKGcIvAvi2fXalaKM+gqXapeb+kknrZCMmk/BGCQMgUpBsKWCtN1jKwQqx6w5KoOUlN4Kpx+HeR6a+esGXnnLuvjw7l5MzW7Ss/PkSWw69TGkC/b7a+bh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rwWIC99gqy3ApmwFc03Vm7F7JMbl9ELXkGLQFibJ127lvXCwPLO/YbtPg3DZcIUiJaNH4KHzWt6p5TZlktodj11ZjBBArU/JteHyTv1FZsfuBQYl9pEFPaSwQzi5oYrqPHuOsRJChwvGfTOIUxSZWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de367db0-8d76-490b-091e-08d96506857f 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:13.5591 (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: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 13/25] avfilter/f_segment: Free outpads' 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: LZ8OvzO26gyr Content-Length: 1232 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_segment.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/f_segment.c b/libavfilter/f_segment.c index f40b18839c..e9b574d5bc 100644 --- a/libavfilter/f_segment.c +++ b/libavfilter/f_segment.c @@ -137,10 +137,8 @@ static av_cold int init(AVFilterContext *ctx, enum AVMediaType type) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -245,9 +243,6 @@ static av_cold void uninit(AVFilterContext *ctx) SegmentContext *s = ctx->priv; av_freep(&s->points); - - for (unsigned i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } #define OFFSET(x) offsetof(SegmentContext, x)