From patchwork Thu Aug 12 01:43:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309423iod; Wed, 11 Aug 2021 18:47:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy44y6TyvMcnGWO77PyySQQBr0LryKjHKnhoy1NHPKK6HNhHJwBdkQ+eWzbgbLbEgeFz46n X-Received: by 2002:aa7:d757:: with SMTP id a23mr2410229eds.29.1628732878426; Wed, 11 Aug 2021 18:47:58 -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 q18si1252937edi.63.2021.08.11.18.47.58; Wed, 11 Aug 2021 18:47:58 -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=o9wuNGSN; 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 6553668A5DC; Thu, 12 Aug 2021 04:45:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2022.outbound.protection.outlook.com [40.92.89.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2944468A318 for ; Thu, 12 Aug 2021 04:45:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AQdNRXMEz8H5Vmz6+pucSS1/BSexRwjBl8tn3o8gra/F0IWugeUa64b5+m25RBABkD2zEyHDEahgiXK9l66e/Q8RjVcedZNkwiFP3r6v0g/IYIgBpGcBpeunysHrE1p5sGWhCl3TiWCEu3zyXJGYvj/q+ZFaymE/9NCSeSv65Fu9oZH91W/pUw9Nyxr/vc60KVTpGnp/CUeDXZ6jtKbpSkckCaD4AaN0Tw5tl1uFnpXG92xjRdhWIvXLD+Ba6uL1eoP6W0NUwUj4HIWTTxPHsXoVejl8RvYDVEK1rI1JgGAEudkpdE7SYAal76asnB1mM2LnhSgj91c/iBE9Y/r2pQ== 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=+I7eP29KjzkbVwFEL1nLGt5WSkBflcmQMApkZHDpBqE=; b=jbjmdunTLiii2/ucdxjKUA2dzONZtIKiHzIewAt1vX4PvVJbHAZQDv9crfr79EUpvjGj3HS4MnIhw50NQWoNHHDtsldndd3ij8gGTa1d6GVge6InTDOMejcO23urUl2deJcEjH64KxycaKmfF2tFe4xOH4TFYTCbnUZRnK5dSYn9i51SyEbfd1VTqucr7L6a9uvghlsSjesphJMOgvukCdyPswghL7lwo8cg59GEE5JabdjSINTXZ/gUTf0WnISHFciTKex5sdkAaKm/9cmTeB+1KjoQrxLthvViumpKtZENJZbG6laDN9/kwvJHegyqJO51HdKYPHFEb7AJkllJaw== 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=+I7eP29KjzkbVwFEL1nLGt5WSkBflcmQMApkZHDpBqE=; b=o9wuNGSN5jbNmlLjHC3O9chSUgnDje+cRrRKUbEIKp4gxHi1/m9cl+p32udctj2i0QbrwZYNuYwLsT4xU2zxJTfuGTQXRmJ7amaKxAabz+9pSbwkNkmWKHVQxSZYcdN7tp9/RjNGesjOLuK2dMsBrbw70fTg/V8Iss2HgQ3epStZHOTcPgp+ePbwGKI+fNzIOzQ1WENywUiQhZYMBHi/Oo/gUSwdngjNuJKtwkgqvye4Wuvm6kAn23jDkvY5Vj2bdrF0G1ZW2dHuXNp5qc4UHntiiLSPG7YvR3CcgqJqzsvkrQGpg8yj56j1iyZPd4PpkYZHULIVOqMJZ63+2nCBcw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6895.eurprd03.prod.outlook.com (2603:10a6:102:e7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Thu, 12 Aug 2021 01:45:20 +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.4394.023; Thu, 12 Aug 2021 01:45:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5yBmfsjX62ye7O2lFvHUbAWlQK6mvG4O] X-ClientProxiedBy: AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210812014357.1098150-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.93.129) by AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 01:44:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a517847-0eaa-4ec2-6e55-08d95d32bc2b X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULQhGwy33veCJo8AyVFweXAutDPtgc5VR22a5WXYvehqg4eR7Sg1GEBalnxVp4jzLeFEGOVcBh5Xo5SX4ui5pcY4TvaEdwGPMgYfRt0IvloKmmf3kL3iMp8yi13KIzWSY6wFSD7XQ6mHXJ51PkgfXEt8efT893nuKxC8z0FPmqGEyBJi9ZPLGB6wfwNxYGShvDlLzRwKXHq/tU5Ifbe7fi80MJTNPbA1s5SPG+9TRYAJdZ45n9rOa1//ZXJqNerlydcj6gJ4K3YEBbsmshR8e/H6it0YVTxiSkr8aCASyACQYjD3KtuWmNhL27m4GmpiGJgVhkH83FLpe/dUnnePq1eYY43fLWMbH56KNFGyF3CC3/WtErY8YXwUT2cu0Qa8GuX1OzQJK1jOuunoqUeG7BElgJdL734bDpckyDBU+sTF8JrRATv1h+RN8jgeDIAbk2vGI9bKEcTLrN1qMdG6kK34ErQvaU/ofJ+Hj8sF3j9YvZNLKo8kJ14YRWJMycm/A8WtAn9YPCR4RHlAmmNf04DlzQMFSgMUeKfVNcu53Q0sjhxaraE/yIinXeeOWmZGSIDgQqwLzVwDNqtmjIvtgkvJTrckp1J4zDGSrlmRy7ZyGE7WCbZfQ3lJiUadNt016oq9h3KKeAjtzKdzLqX07kVy2nDurOGwfNOVh4HVh8TQ5HEE3IyAlRgpaF6refovjas/QqrLkV/gQ== X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j/TtKsSyc15IoLIRfTYsaSyCrJYykmOexV6u6oXV0yrfIWl85rCOl43CJLCjKP4ttVYCWV6qepVhL2c/xOUiRPBYPQaJmVS/fyONMEMFzsZWK7Xgr7/nZLQZojjOxoZcDeQQPy4fOwQXGjudzcJdTQ/snzxZO05AOobj+ViPmoSaYfeJUIiLSX1h/rGsYxnadABL5DFn1p8UdybM8IN+yiVAeqhuVqAl1j9pzKawRodlOTXzuJ9GgD5YxzwazvKS7c99XaVcuABAdv2TpoJtTwNowJ9fYHhwtasUGnnKMyhjafA+0y5wCpE7i9ha0IkXqpMcO6NVNLRkFKWZS1hZZkN7MAGNK6QVw41OlDu/bvGJNaeSmH/5Pnn3tbfZVQ0knjP5NZU+ao98DYUfwspovNnbayNhTyluLCGKpYKn+gOGmld8qjJIXl+8eNOljqin X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AdSnmt+5mT5abkAiSPhzO6Gx6haA0hWcGqVj0CMrO6jj0N3pYQPcv2qmGp7KTvIQqPtNu0cstq34AfwlqfgyJj3GfIQ2DXdrXIaqWfZqv6XITn6WgTSfCLHCmV/EDr5j8icjw/XYNdbFc7tmtkeHig== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a517847-0eaa-4ec2-6e55-08d95d32bc2b X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 01:44:33.8198 (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: PA4PR03MB6895 Subject: [FFmpeg-devel] [PATCH 21/23] 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: dpuov29JLWv7 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_stack.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 3368e25c9c..33cef09a91 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_insert_inpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) return ret; - } } return 0; @@ -371,14 +369,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) @@ -420,6 +414,7 @@ const AVFilter ff_vf_hstack = { .uninit = uninit, .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif /* CONFIG_HSTACK_FILTER */ @@ -440,6 +435,7 @@ const AVFilter ff_vf_vstack = { .uninit = uninit, .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif /* CONFIG_VSTACK_FILTER */ @@ -467,6 +463,7 @@ const AVFilter ff_vf_xstack = { .uninit = uninit, .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif /* CONFIG_XSTACK_FILTER */