From patchwork Sun Aug 22 00:47:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29716 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653484ybj; Sat, 21 Aug 2021 17:50:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIK7hOy+lB1VNYZBmHLfDDf+8W4oIfYS6eiZViglMcI3Ir0Naro2vXc3ba1WAFd4bRr/pS X-Received: by 2002:a17:906:7c4c:: with SMTP id g12mr15841466ejp.74.1629593405177; Sat, 21 Aug 2021 17:50:05 -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 u1si9786994ejb.723.2021.08.21.17.50.04; Sat, 21 Aug 2021 17:50:05 -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=XBfvJ7cE; 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 E499B68A543; Sun, 22 Aug 2021 03:48:29 +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.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6200768A307 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=ZqQL6ApgiA7dtoK2QGPBSAxg7xov67kFaX94U3Ix4kbwFOv36KcSAz4S82fLY/+o/jeN4Cy4vfwineqq3K3gbHR6AnfwJRL3yVVxBXS1xuG7W2oA6Ko+Hxhe/L5un2W215ozJ1Y/OK69tOOS1SZINCSSMUCgPKkcwetqI+ZqbjLvkCx0MJUPvhxz2MuDXnnt9AJ8Pt4ESGM+jHPCvc7uaahvXJR/1s3ddhlfIex6pdp65GOGFA4wqVj+cTx88jLJSA1mB/azkCl5aQP3HcBomNiRDklcbDHvCy882UBvCWvd9uJuRo7FFcy3yJ7LwWSKVGiqZVkvzQrPhXUKrsxhhA== 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=RhNlpSvdS2JqY8U1Jyr7Tth0uNEI0aCRp1nUpzTAePs=; b=e1w1vydsej4qrJG008ORaoqOJ/E2gXPg+mesnw9oc2kK7Yv1spPRbMLKVGGzl6uZNFk4DSeJ7lix3j/DIhSwBaNIbqznd3m9K1doDCHVYgFDaCK7fLucqLx2Km7L1OClJAFT7MIsjBCOLVs8HUxK9JsrY+VSyiR+rot7Dw49KeacAXiBxakrfUMUD/TMASDr2gXa+Vl8ULRkcsetnOz34SkhgOZxwuOnK+9wDt0BecgloY+YRm3mhbetsmE8I6p692ZKcC3+bJw+9PO4A+GGoGVPwFYke6tnNDb8g244hXQYsHaCZzJ1/zBTbRCo7Li8qEh4nYJioe8rDuekupitlg== 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=RhNlpSvdS2JqY8U1Jyr7Tth0uNEI0aCRp1nUpzTAePs=; b=XBfvJ7cEZDYiB9rq78eaXFPW+rhlxW9fn6BlWvNW9Hh5iOQKDO1B++PM9U1rDLxH93qoR0XsVHMwwJ5iDqh8mTsRhueYYKlxJh+q116DrD2Ebe3Y90R6++p96z4wHhVgXxyyo/VtwfdNOWlJcXxmCmC7I3B5QUHr3U5QPatje+YHZ7e2k9tn6nZNgnMKAw8FCASfqSleS7ItLCayjilCuy3s7e2dOc8lsIL9oGhauHSWsqRjZeRmN/PC4IIisf4KqyDUtcEuPpU3rlzxBl73c7x9xugDJsqd2nOi5Lqg3+7wKvTsYyfFreS9QXS8nzgJ8L0VLanuLcgX/OzGmeLeKg== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [JkMrYKdoUMM6PLIwOY6Agv5oxu5s5FIT] 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-13-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:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54bdf51f-a94b-4abb-3ef1-08d965068612 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoqfBJgLJbQEjMqfzqX9Emsjj+WrHudTekPAzPkQ6+iop/A0O3W3/0DMJnVwvDG6gDh5hRubQL/Bq7QACck1LC2uF321uTPzUIlxZOdq7vA7CxB+81EJ/PUadjp73jWjJVDuXmdlVjj/C39aQwj6ybF1QGosc+5T9Lyh2ZkTaLxXoJXHmE0E4RPI8ikF5g/nTRK0ZM44Tx2Fi5Wvew666QyUP+NbCkuhj+mHYVfZk0j1VV+3HWM/2CZwCulRJVsvYIrnrYY21rp03ajZ9xP6o8H/ja2gALn1stxhIDcFSwb/U03a4zoC4A6k1TS2Ux/XA03SObYCNX9fx6LUSLtPtSZyGO3zO43jx1np+Im10cf/1gjhXr066UAYvISyGgcCnRiU24mcegzEqWiKEut+tmN8pvMEDjKU6CIjAL97iVeXv+QFkQUbpFoo8PxS92YGEHLEdkjRMySb4cMGaRZ1rHYFYlic4pH9hnvvqpf1203wu2Zhqj8ZMXlpfV62KjZZ7iTF9pOVP8JqfONgfgCgTPS5UIVgltGJZgm1nJ04jkTOePHdRoLvPWgNiDAK9s3apvj7vh2vGUZt3P+yr99Mhtvu4qqpuzZjhXTyOM+577gkGrTR4HGl3rcozvxH7Zd/vX0Smg54kVRXikI6sp0Ikjuf3EVHrwTB3qUSnv0WB3sc3TnOGRG2gNrc6OLwp7Z5gm0NF/+Iv9DRSEprNITyjRYE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8yAa4Z1XUfy8pE0OTuLjoFMPIIKOZ59e/L3vNvgE1ag+LqHUbl1RCjMUYQkDopUsZJxrYhUTRGCNicbEaDuzLJ7rg50Yd+RTqkBtsnYKioXw1M4DhYCW/Ge4GNn6gG0YV3nmlcRVOtmTcbhwr/374/La9xF15NU6Mjo+xz3oZW4wFjhnw/Ob2aAgj8FOyN5jRpxLM+I7eL+Qhaw9gOsBC6EbbZipOH7Hwvk/1bouLh7WntNYxll/4txPg/g5oc6TclSZiCYq8Fc5E2rUDnZEflx2ODlpoAmtyJumMG66fT0MJ5+EVI1QLbWffgsF0uu3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cCP6lLFrkIwyqCeWj3EmTmxYRv/W5bOlMjAh5imTMw75NAAjYMUt4llJ0Bjt4c/R4RswtLHctdlPjm4+B4JEloTLhOh/4ADePiqDfeVtvk8tiUJSNEJdMUXmYEbsbi4qHYI5JR64zXMVXvaa3mf/6w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54bdf51f-a94b-4abb-3ef1-08d965068612 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:14.5388 (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 14/25] avfilter/f_select: 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: c8gri7h+6fAc Content-Length: 1404 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_select.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index fad54ab16a..187e98a1a7 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -192,10 +192,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.type = ctx->filter->inputs[0].type; pad.request_frame = request_frame; - 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; @@ -432,14 +430,10 @@ static int request_frame(AVFilterLink *outlink) static av_cold void uninit(AVFilterContext *ctx) { SelectContext *select = ctx->priv; - int i; av_expr_free(select->expr); select->expr = NULL; - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); - if (select->do_scene_detect) { av_frame_free(&select->prev_picref); }