From patchwork Sun Aug 22 00:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29705 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654294ybj; Sat, 21 Aug 2021 17:51:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFgqLJ9A6RhUl6e6i7xZXW1yynu0wsdZXenlynvDM9kZSTgdtCtamOnqwzirlPzOeWpWeO X-Received: by 2002:a17:906:30d0:: with SMTP id b16mr28400788ejb.495.1629593486904; Sat, 21 Aug 2021 17:51:26 -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 p26si10072178edx.85.2021.08.21.17.51.26; Sat, 21 Aug 2021 17:51:26 -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="B+g/Qfd7"; 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 2C23368A5DE; Sun, 22 Aug 2021 03:48:38 +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 6417168A5D9 for ; Sun, 22 Aug 2021 03:48:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b4rpxR6/JPXFoGJzfwgHe1T+wOvE7mGYn8w7a03t6IUnYVYG711QrI/XAg/Zb6jIxdZBfsy0CfUgGTs2KOPSDYGXhDSrevsKHmSCOCfz2TphdUGfOA/VUtPZX/JKmEy5wgqst0kHeaO+o2NLOcKU4VVIZFkX3jGeTcPcrz1bYjRCXlgc7pf7xmQB/CdMZAP1ZunBGEu0HEGdrq4uKO3Ay8buhe7AkWDUViYvN8g9A1ipZshMNBe5RvCUTYQyQUrVEsBn6BOM44DA/CJ7aujmY6bj6IQ2HsTMabim0ddjU6u7OXslsXY39mxoxJ0Fa5WDA6CeOSuX0+ONGSBuQV2ZsQ== 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=qrHxKkMReYgwMo1DHjm1Y4liXZI8BjugFQgaAXhdrYg=; b=EFoogqAWIGtusGyMkUsjzZNuyI70R1rnDWj8I7ITlR7B5CXc2IovOSkt4dTH+HfoqyO8byFk6m/Y82/7TCFhrSUc3cpOflRoPBx95neM2pfCU3faOqw45TCQ0hyfXLhb5rs/bBFPQt3gawhR3uObAdM97e4RlsbCkxvjK+w+SHaP955hisqnzFbponOcD2omkKfRSvWsZWduQsrfug871x41l9tAzMsTS69K6K4TALM8MHtSWQaGyMYcpQXbWbdx2TcdnjeA04oXLOQvlPxeIClNBG2ERYGfKxvrupw6GaCbZ/VVVyjChAuhCnVuvdPBxj0xGF1kKKZIGNkTC3sHxw== 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=qrHxKkMReYgwMo1DHjm1Y4liXZI8BjugFQgaAXhdrYg=; b=B+g/Qfd7xy0Me31g3+o5huTEevaL48yRsvxgxZ1DUQGHCs+YB+m63CEqdaplgWh3McxxKdcHGdHXpm1xrMHkG3qUt1jS3IMscNn5LnBvQolN1Apj8OjQUsNE2Ax7g16ShlXWFIpTMFfLNg0EevrT2zsn9uPMyfntUk27aA8cwi1tHwj2oZGJuLBJihvhrgB6lK3QcUlnp5PCWRPyl96UkDuW2YkTG6bqJjEneY7DrJ+dBTfxXL2WlbKshOLcbwiQrywQdN3LZJYk14zYt3+sYS6N0jT6XLOL9gLTrX1k2eHcIwOFhIhLiGFKzxAC7pDKhP4R1q0xS97ipYefD8wPwg== 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:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8FFACOExCVOduX3A2m9W45HJUWaQRddW] 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-22-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f265507f-115b-4251-6f8a-08d9650690cb X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJwWgviN1+H3b7CoJreyzU2fis50jOBlNgHmBjovl6gUZRGUOU3OB1W29kx1jcMmjRciCekVl9OM/kCMbTB4CV0OqYxm8U9AzgrLARdIfND74PWksV9Cm8j4jsOMAFReTWcsBqt+CP/KDBkss0pFzk67uxgb73Fm7vgV4UI+wz8GrQJBiqaWiIEYXKOI5nkNeLBgWoJBlBFL61s8/wgQsnCRlToRwkFfEGmoxVljc4mvFCfE9AOLAIbG7SZsy7f/+n2cnPrd2DW86eoycbrjCAkISHN3dbUxY2pgnsTujUc4vLNo+6+3X+4rENDGmwnVyc8wVefsqB8/3goETTpquaVmWWUo9rvU+PyACaV9KRXLFibPJ6m2ZupbU6fXmLiwaLcZ0yi7Vz4ntttjhgCyi6qab7zQ1mPY98GEtGkzcQWU9OGxTqqpprr5g4uAGyT8O/lUjkK0njp7y5K882kndQ0D6OBd5Jwz+MDYibLXztz4CzEwPLqMVq9Si0sa29EMnWo+3SOjY1LthLjZLHy4gXTDNbpNXyWu6R/rcbst9/Pk7tdGfHcI/RVCoRoxUywYRDeGFRhWpyePt2PD2vtJnL/dTgCa9wisOG1v2KecQn90XhbQ0GF/w5sGeTjKsnUOIPemohYaPq3vRyWGLjQ0gfBCXnTAew7NL5njERxoGbMilW6BacIJfco6nhzvB1A7sBhJf9AWjtwcg== X-MS-TrafficTypeDiagnostic: PA4PR03MB7296: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c1C3oKzbt9GSYyiD0njwymTSioJb6OgIwHNS4/mbAdCx3X48ycUbwlhGZmcwJPqmBO1u/m+2uChytm8Uoc5V74Skc11xnmHxgw0MtQNU9YPVluTqJkvjMx8cwdX4ArYRWLnqI6NpaTW7LzIwTEYtCCgn8eb5nOE10l25XLJpOi5XGzYGSr3GixF4/kPXTlRjuciyRLaSKaUfpapIlGpTDWFCcljEgZZmBNrC1DMt84mQ85pQPqY591hCruL3trJhiBIi4PcHRWlOzvhuDO0kafeG2SthiLoHFVzDiUlPz/4zrLQYjo2/bzI0L8TpSmiF75JiQ8o/vso//trQds50rxJi/s5dWOzIbHfArQyfVYjBnF7JcpWMDoQMG1xFKbZowDVPpFgt31tjdYDx+JP30agaMO4UnYbLs4UsNRNR9S+KVl3FbFM8fp2TgxiVHVRJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C08+wubYTmdB6mEofmfkdDkUyGNrla1jZ/sP4TG7uNFVWOLqZDtf9vWAJcGbOximB4oDcqzUYlyzrnHLoc7KdN42kSVvsmRxWN82LuWtgl6bCm5A05kOwVIbelK3PHEQaWdedEc9edJE4I3OkXnsRg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f265507f-115b-4251-6f8a-08d9650690cb 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:32.5018 (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 23/25] avfilter/vf_stack: 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: nxnAkeCrD0SX Content-Length: 1312 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_stack.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 8d3360169d..a87cffc491 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -123,10 +123,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; @@ -372,14 +370,10 @@ static int config_output(AVFilterLink *outlink) static av_cold void uninit(AVFilterContext *ctx) { StackContext *s = ctx->priv; - int i; ff_framesync_uninit(&s->fs); av_freep(&s->frames); av_freep(&s->items); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int activate(AVFilterContext *ctx)