From patchwork Thu Aug 12 01:22:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29444 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp295242iod; Wed, 11 Aug 2021 18:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5p5ikn1CCUoLq/Qabyz3RdMFHrztCeb1ZoGeQ/uLrtLCjff0YXvTeieaFIramZzi0QqgE X-Received: by 2002:a05:6402:274d:: with SMTP id z13mr1473009edd.386.1628731385925; Wed, 11 Aug 2021 18:23: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 di3si970666ejc.490.2021.08.11.18.23.05; Wed, 11 Aug 2021 18:23: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=lG12HWoR; 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 F21BC68A278; Thu, 12 Aug 2021 04:23:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01olkn0040.outbound.protection.outlook.com [40.92.76.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47AAD68A03A for ; Thu, 12 Aug 2021 04:22:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WYJJficzG9RFgkP5oqJJP0xQ6aFORyPCnXjvMo6k1+8pa7E4+nlsfYNDFWRN7n2Hc4+RUXoQ6u45FqreT9E96AzJrivtPbGhVT58lTsAI+5VkqdisHhEzrrfLPAuH83Z1e7PQ/gxGxKB0VmoRbPb3V6fhoulTKIbq7m6OY8NxkjQDteb0TLgdBrm7Z8KMzEz1KhwIVRnz5FEUfDJrPU+SC15VT8Vy12e92lw1pYjVofVOBnS/Z7fbfhg8X4ZqjMTFeThastJ4QjlCs/sdvifZW7paAtO7JdfUB+XZ6rr18butP/kVB5iCH9LnKqO9tmOPCy5eozduCau/VkJ/fsW5Q== 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=VPTsJjgk5Kdlmk+jB1NWDja8oG1+rzKNrrnSuXTwIcE=; b=GrWV6CZEc3MgceSJc9MkTBcAOo6/ooeg4dog3Dbsmmq5KCcaxLdr5OdHBWVMh49BhhkzgwYMeYnZfYjyMDp5uQ832sp1nqaAQeFPF8eMn2334v88vL5YY2tl5h7SryXsVE9jDbZ4e50Uz5mYzGZ71gad6J9ZGJTvEXHOweSYsR5jruhoxzHP5QubdpckCXu757MBD7COwtPbw25kwrhHgiWZfrz2TJW39PEW5vTQ9SizVs8MfDAs5989brZ3wrbTprv28COaKhRmJAGawBDm4oFWa0Y91VPwROXYZWUSCa8S0eAPKKXD9MZLGGg2jQa85J5VrTZS6yFbNv+XO9K85w== 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=VPTsJjgk5Kdlmk+jB1NWDja8oG1+rzKNrrnSuXTwIcE=; b=lG12HWoR8XKDeXRM69ye6OKs0RXYoE4COassGMBa/JYVis8GwytplCnJcZMJKPLB6DzVr//86tFV71I3WxxaTTYsqwzUYD9hcpiNHOwRAAxDbmwDkwlbDVmi7at9fNg0d3bFGG1h8CXeHeMtbK/7vuS6/vEAk9PtPvf0V6rbXTKMqns4bWh3r1f/R0Od5is5ET90Es8mlOGALF//vulyRo4UFJsIKzxkn5DMXA2Fl3xZK+8vxys6mhn1ie48T1Wa2740bd4T9ZOE8yOKX5JkMgRKvnVh16cMQC4A1riA1XJcbgROI3jAUSL0BdbCoEjnEKuwAp5eSb0s5ometmdl7w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5465.eurprd03.prod.outlook.com (2603:10a6:101:23::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Thu, 12 Aug 2021 01:22:50 +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:22:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:22:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [+AURhJKfWiHKK65eXAMQmKskdngP3zUV] X-ClientProxiedBy: FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210812012242.1097999-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.93.129) by FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.9 via Frontend Transport; Thu, 12 Aug 2021 01:22:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 476b1f9f-a0c4-4290-c05b-08d95d2fb34f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP7yb/GKY2Lt6LvGpRtYzz8xUt2h7U5n9PQDlCA6Bg+cIgMS50C1kHxFAJWYsT7xYcsmXnsWEU7Tie3yHPryqEa6EapF7Ib/pdxN45NYNii4LNatsJ7hxdlj23HLxHj1StudSYf0icS43LQwIaZlJlKp2Pm4T3koJ1xXdDnpujEtkEWycyA4IPtgYaOT67iNjI37VkiN7PRlABsEUX03SVjlOC4y1Vk7ctIcv+OQpafsuxS2/oE/TkqCjrPz5HIgNOgl4YwsiHYfbYyXG6qMb5+Qwe9Z1Z/yqCblEbMmI4TeTMqZM9+U5jZzVqb6C7nPFL024vzTUIcKgXCfEmbjVr4HZ6B9Lz+BERVRkJNSp/6yMlRIAk+XiWIWbmktXFipi9649OZdVp20f5Fv/te+AGO88RuXlcAc3EpK/H501BetZRv93YnqVFq2IfMtxT2HgI/QB0mT+VvPkfcADqulbui0Yvyx+Rk2u0+RxCuBOY8PT6TsysSOxWZZ5VUZjkzyqJImjV5FCNFEo6y8XBoZETQru16oMaeLwbiL/AQM8472x+2V035dzfpW4qsKsEbOrsZS4Ipv9/eBnkglQkEKfYd4H0Lqi7mgkvQwyHLsObFbvTueCEERKnYLxfksy3tZuHSEk7qEUvVtuxPjF+36HKHuV6My0i0GEyF1g9ZJE7I8vwnTIDcVL2Cjof1Hl6UOrKr7Bn9CMJKyo4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5465: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mCBxuuMLjtBtOhz4wsHo94D1bQHDfWCwndxjgWHCLGDrKowizdN/ui82LWtEMzssuJAmcVJKkWpPisNDgsAyAEJU9AS9LHcVVKWgYaYGT/dbBkILOn/oK4wTf801+aryk1OLQptDfc1PVXrWkYLGyvf2TfyhG6Fz7lEpSiYKX/V0zjUu5WZx7KLhfbEXPq47HdJ749n10wPt65weuivJyTy6wSeFy0vn019c4Kf27yf4Q39U1y04VPGol4WuLcJkXK7zhrwgtrJSaQ8bWwVmx29aJlIMMv2D8yvESW8z/oysaGaiH2QxM0Rcp6jZAJ3YMs3vo5fjlzN1OqbQLR72lTKZJ267vvUmh8uA8rcSwyhIrcg4GFnauitoxqcu5U85IwbLsJAXBqX8zrvCOgsl/CsEanDuq+OWdMv/27IaYzGypUE3Ju7NGmPVdiGnzsWC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dVf3Pa2k0eGD+Nc5P3JbDAYddiR/tCf/g7nMzyR9B/gLcLqA1qgga/YR7tknE6MqSlItTZb/oAyLaK5xT/e0baKQ32u1cwlBZCvwCU2EcjCyCEZnkKdCBQsTXS0aMvlTcbfsDlGGQK46LV9Y5Tfd8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 476b1f9f-a0c4-4290-c05b-08d95d2fb34f 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:22:50.9132 (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: PR2PR03MB5465 Subject: [FFmpeg-devel] [PATCH 01/23] avfilter/vf_(guided|program_opencl): Add missing dynamic inputs flag 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: fbSsxKTEE4TN The code for inserting inpads can't be reached by ff_vsrc_openclsrc (unsurprising given that it is a source filter), so it didn't get the flag. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 3 ++- libavfilter/vf_program_opencl.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 202a6a0586..e2bf08f5c3 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -500,6 +500,7 @@ const AVFilter ff_vf_guided = { .activate = activate, .inputs = NULL, .outputs = guided_outputs, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | + AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index 4b38baeb3c..5f455e9afa 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -367,6 +367,7 @@ const AVFilter ff_vf_program_opencl = { .description = NULL_IF_CONFIG_SMALL("Filter video using an OpenCL program"), .priv_size = sizeof(ProgramOpenCLContext), .priv_class = &program_opencl_class, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, .preinit = &program_opencl_framesync_preinit, .init = &program_opencl_init, .uninit = &program_opencl_uninit, From patchwork Thu Aug 12 01:43:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307229iod; Wed, 11 Aug 2021 18:44:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1LAE6y7SHtsNG42P8580quGgk8BVd8zDYbUOCChdmgKq5t05LU7vzAnmvv8jaHbEZjaEd X-Received: by 2002:a17:906:30d8:: with SMTP id b24mr1357039ejb.358.1628732663989; Wed, 11 Aug 2021 18:44:23 -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 rh8si776794ejb.646.2021.08.11.18.44.23; Wed, 11 Aug 2021 18:44:23 -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=qRsh6y8n; 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 BB49F68011C; Thu, 12 Aug 2021 04:44:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0026.outbound.protection.outlook.com [40.92.77.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EF8D68011C for ; Thu, 12 Aug 2021 04:44:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NG154yfu/apEAh9mBGbKvVrsSg8Pd12aGnQ7R7O/DmHl7JvlG45PZqEknBRw8CHyShnXAAu1XxGSyUiLr/Bu4HdL4QBD9oZCAkN4uDsR2+JsGN5rbI4mLio5sfoOeT5SNvRssOpAEFU77JFLWeAZVumpcGJo834LDYKFdje010yUlwzwB3NSQdPEpgAT2rHO8CBZbUXmYKo4ue/35MrL2RBEFX8etCGgFzWFAl9ng4R8yWPkL30gibHBqZcEbQK6rU4PZtKywqbbvaa/6h0ZCkHqlnxH6AuVX7nKOVwvmJWmg5Syq5CO6xR0bBfejc+DUi5w0c1PWhkPJCr4tqMDKA== 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=BMUVJgn3X7T9WUcdDVIcUMu4vUHksYyrN2MJkukS1iY=; b=DnXKxCUwmMibeIJ5vs/mTNG1QnWy4zxa3ugpxeM6YZ+JgM0Zh6jXUQqaDrJlom3cQ4vYCHp5Q9a4Cv3rPRdwEyh4cwwMapRAd93Z5h4X4ivk2W2YQK++Ox7YzXP9QHEjmOYlukZ5nL30fYE4auBC3gHtHi2dG1j/uK0iovE1PqygJoP7UNj+1V+lK2ygs0Wzrn63NbqEozSFd2FQxLyLdYqDcSJRnP5R4KYSE9AYeWjohrCgSAgRAJUAW1Jle5JUhubF+eAz6HgXO5NF1PRPSM3E35QFRSG81mg4ph8EaIELKTYJD3MAazKXYIN3JcTjIIvKV7i7JVcu0/CFNHWASw== 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=BMUVJgn3X7T9WUcdDVIcUMu4vUHksYyrN2MJkukS1iY=; b=qRsh6y8nLy9MzU8nd2vAoP4i9CKBkqzhx7OLye8VT6vFHkedV5Reg5L6XFw96yxTC+ZivC68MLyZvI9Egr+ndPymxhBZr/IkuV219rtr7Rvm9AgUzHaDqhjVM9L3Gl8GATJzwDqfQZjD/HsBWn4RgX3XbeW1wThB8FyvKA1Ds9KIHkoft4rhxQimkQQh19KWm5PN/x6PSVggdlWvHdgonbRpMhnwBTChNK2ZMyp47s2i1obU4bOWuMcaJGRLs5Mbju/lmf1E7i96NZNZHI1aWevdAC3bihYGXo/lB8erQN8DJix3tzVRFU0lHEmqTVg4V1ydF6KPayw6A7J/Ujz6hQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:06 +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:44:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YXGdBUpC/Fsn4NfEsEOsXdgdrpsvGC0f] 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-1-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9142f0b-a0d0-49cb-c256-08d95d32ab98 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR5gNVTvlHqUF7fkSPCt0YIlYn1B5zgEA6NLuD2f3FT2RD1IU71ZSyUgW2CltJFjhNFq7tUseyxqFGc4AzOMrUbfCUSDD+CLwd6C+ci8RW4zUMJGZcslx3CAf8yLtsbXCCxXzSUbt+JzlrvdYXN5NWs1KOyeEicvxM5FQhnLUy5WgkjIackpsy05qXYiPIhc7MxVMgs2W0KWwbse58U3hzXR+ASxogFrI62QAynBMDsfuabgmyrvxXQHYQuipzSThPOQBZV6QZkamMDsyUrSVg6shlXIv5mcZ8PRUMG8WGi7DQ0bpHG1+H2KYuywG8G3++u/Y8S31mZ2ugLh6b7WirTvHPggNa7tROPST5XaevdZv4aWQTvNLlNup8QlaxeCzyNn9cTBGAlAPNiDaar/c61orktetgaJHz8qPDet8Vp5DzB1a/P5x0kTcgsHsWZeCJNFW/HYCjHPh1ckZv0VxVMqPlEC0daW8VQilJpe9GTgQBA2OYEkzMQNLHwupD8j5rHGGwxVwqEW/1Pkd0nhyF9iRnstnFL8gczY3bLdSZxpHFVO0jkkBrrF9bkossoxmElCJRQiqIo7Mc2ygpwpn5g+OPB+ufJQnVbbwWowZSvzo8BSpWO/LeGOnb5DrKPSsVksiIy0xBTLEDO4YEbQYaSB9kJLqbZBkGha1SMFpCxzfV1NY3nvUCoVs1qlg8UwLf8oyFKw0U6vHS2TlUkiRLzKtaijBJMjHRra9exKkXHg0= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: onkZh+oBKXqDo0Rv2l8YXI+Fpk6sb7V6DFLtxU6Kq/Qoy5ok0P+tJCCqGfCXXm31dgJF4dWV4MnIaXNgk9Ur6k+uB3HCZKc3vbDOpaIpVVr2Xmdnxw7n2yFp4tdillEsv1BFhUWppi1Hz+VK2Ecg5cDhEqw1lGQt9st9ktqJQVXztLnFwySy96YE2Vvq08zEpv87X3A7LpOMMeYPgjdv/dS6BC0Iqi2d1EnZvcwzWQglHvSM0hUvQr8Fb+BVmGlTMD3Fo1FmSAOS4TjKgRMomhQ4UkEN5wEM/RDCVNGq0WTjyAO5tgUinJiTCBxq97d1KBD7q0m1+pIqxd9R6Vr2SKu/MXtyC62vhI8DSu3DhCICfkZcEvLMeCt2N7WByZf4i+5O0kUTdAtAxaE7b6aWLql/TCgd9wwN3JVwcANfavguq+TcBIdR1h7IGloCrYP+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2goiE57difUK4tLKd7dKsdUpzl9drZpyUeP634pT1iMVAOqoLk+CfzpYYycZaCe0bJNA3HiBSN7th2QJRZOe4V8h0+MNFMJ8tXXPKoH+AeIJgGbF98HWtjsepVLUcuWuWDUq2vwXGHan1uxFQLRxlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9142f0b-a0d0-49cb-c256-08d95d32ab98 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:06.0877 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 02/23] avfilter/internal: Uninline ff_insert_(in|out)pad() 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: UjWZxPt0JtBw These functions are not hot at all and future commits will make them bigger. Signed-off-by: Andreas Rheinhardt --- I haven't found a caller that adds a pad somewhere else than the end of the list, so the index parameter could be removed. Shall I do so or is there a compelling reason to retain this functionality? libavfilter/avfilter.c | 32 +++++++++++++++++++++++++++++--- libavfilter/internal.h | 32 ++------------------------------ 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f9d7226386..de7501c37b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -101,9 +101,23 @@ void ff_command_queue_pop(AVFilterContext *filter) av_free(c); } -int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, - AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad) +/** + * Insert a new pad. + * + * @param idx Insertion point. Pad is inserted at the end if this point + * is beyond the end of the list of pads. + * @param count Pointer to the number of pads in the list + * @param padidx_off Offset within an AVFilterLink structure to the element + * to increment when inserting a new pad causes link + * numbering to change + * @param pads Pointer to the pointer to the beginning of the list of pads + * @param links Pointer to the pointer to the beginning of the list of links + * @param newpad The new pad to add. A copy is made when adding. + * @return >= 0 in case of success, a negative AVERROR code on error + */ +static int insert_pad(unsigned idx, unsigned *count, size_t padidx_off, + AVFilterPad **pads, AVFilterLink ***links, + AVFilterPad *newpad) { AVFilterLink **newlinks; AVFilterPad *newpads; @@ -133,6 +147,18 @@ int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, return 0; } +int ff_insert_inpad(AVFilterContext *f, unsigned index, AVFilterPad *p) +{ + return insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), + &f->input_pads, &f->inputs, p); +} + +int ff_insert_outpad(AVFilterContext *f, unsigned index, AVFilterPad *p) +{ + return insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), + &f->output_pads, &f->outputs, p); +} + int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6c908690b4..615b725cab 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -214,39 +214,11 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end); void ff_tlog_link(void *ctx, AVFilterLink *link, int end); -/** - * Insert a new pad. - * - * @param idx Insertion point. Pad is inserted at the end if this point - * is beyond the end of the list of pads. - * @param count Pointer to the number of pads in the list - * @param padidx_off Offset within an AVFilterLink structure to the element - * to increment when inserting a new pad causes link - * numbering to change - * @param pads Pointer to the pointer to the beginning of the list of pads - * @param links Pointer to the pointer to the beginning of the list of links - * @param newpad The new pad to add. A copy is made when adding. - * @return >= 0 in case of success, a negative AVERROR code on error - */ -int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, - AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad); - /** Insert a new input pad for the filter. */ -static inline int ff_insert_inpad(AVFilterContext *f, unsigned index, - AVFilterPad *p) -{ - return ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), - &f->input_pads, &f->inputs, p); -} +int ff_insert_inpad(AVFilterContext *f, unsigned index, AVFilterPad *p); /** Insert a new output pad for the filter. */ -static inline int ff_insert_outpad(AVFilterContext *f, unsigned index, - AVFilterPad *p) -{ - return ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), - &f->output_pads, &f->outputs, p); -} +int ff_insert_outpad(AVFilterContext *f, unsigned index, AVFilterPad *p); /** * Request an input frame from the filter at the other end of the link. From patchwork Thu Aug 12 01:43:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307303iod; Wed, 11 Aug 2021 18:44:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4V9HvazBIfqMJmZbT+KooouPBwoCk5lNFmkbaSdvu+XsMl24uiZO//K36EdydlItvJJIU X-Received: by 2002:a05:6402:27d1:: with SMTP id c17mr2386739ede.178.1628732673607; Wed, 11 Aug 2021 18:44:33 -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 lj6si859691ejb.405.2021.08.11.18.44.33; Wed, 11 Aug 2021 18:44:33 -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="DidHS1V/"; 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 C7D4668A318; Thu, 12 Aug 2021 04:44:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0044.outbound.protection.outlook.com [40.92.77.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 119836808E6 for ; Thu, 12 Aug 2021 04:44:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IWsiZvZRLXgUx0VJy1ZTVKpIMuOzZ53v645h4ZcZRrVneYOcmApLvHzd34eQslxcxEU4/PlNqhvIEgD8Ha/9AruS7+Jn3pJ//lzXVC/XjbmO8mKOiV6yhh7d1t4haz56l1T9+yy3xyHXHBcUfqpu0AqxRc5VdRXm82I4mA2GS+D8Xq2KAik4Da6JeSzz/A0fTfwrEfBf9hYdwfImy21vnHSQyUK/NURIGpEZrRz2xxbSNA5ssF2kIWW9cC5t55o0MMx76fkIs/qLSwktp1hB7dUYLmpwVvdH5kITwToXGULisMqmAvkCZohrvPHI1Dy40GKsswNOcC+E5szIu/yCMA== 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=uU1s5tt3Xe2YzT0VGVfuVlEUl2/vqs2K2VX1IitMeoc=; b=aUcd/Mvix67GEvPFcbQu7tZQGWZ1JSDvRC3W8lEPJepl0sBRqHVbPQPV5K6W3npSPqqkhsMJEcpubXc4OFTpeInWY3n5C1/1siD+HM3E6PKK+lvCWaKHSGO8VAa/TjXT9EIvOuZ4lG+CGBKBbAgjgXAI3t/SDXJnAJg9+8OmA9k9KGb4QAhpbiazKbunwXYxL5vsv9H/6KHlk49Mp+C3ZPueczRYPHl7U4ASM6/HdWum3fs2b6TVpp8qdAG42B/GeXIBgQd7yCBZ30/Ykjvq+ScDQ33/V5I+yznkgOzWj6+l+MRzPu+TIjkXSJi4PZnv3G42mrvyKiJKRyGsW+WYnQ== 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=uU1s5tt3Xe2YzT0VGVfuVlEUl2/vqs2K2VX1IitMeoc=; b=DidHS1V/l5gwHx32GFtqk9X6iLOTVEDe4oAO6d31NHyIoeh1NQ8P5Ns5FX+YmrLOyxqnKG5G4eyvbqKJmU7NlUEiX9esRmTyRqmylK/akYWbp0XceFnKdGjA5f3zyq0vaDZrLm6okhQvDetJGzSMENnxcivx6XxJWkWl9NotDv92JRmUfOCpt0uiCSLuLjWCFN7+YUQRo1ab2AAQhbgjcx6fMBh6NkNgABFA21t9LF5ZHH59bADmK6gfDqp0Omj6GL+xGLD0Zq80HyGJn5h5zy6OEBXKbCQqVGCAsfWvljSbZGrIdwgkI6o6HSVzzHTloXJl9C6fOXfvKQ+LHJZqGw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:21 +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:44:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [PWtO+2Fwrx+JI59x3cTFmQCrH8Y0w0Fi] 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-2-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:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20228116-9d9b-41f4-0bcb-08d95d32b4a2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRBRneedN+Pj668Fj2JpR7YOSWrqrA3lML5NshPD38ArGoKYhafxralfYmrzr+xXjX7N31JSDg2GH3YhD4LNLM93hOu6LcwIpv+mVPHrSslOD5WtkNiwI8zOyZQgXVnYipfIiEWZBea1ZbV5Cx71oUyraS+lWk49+CW5ZUAdCrnPw8FA/8AWUSAITpbsf5ByjzJlO2iKWVx+6yo9FufSsYEtU8Ce7EH5/lOPO5Vmt7RhpIpZ9s90hy/Bo7yeRyOU0PI1FKbYIKEyl9JCORaUegAbvXcTf0LY9pvNX3663MJZczNbcknrCWwlId9dcaF76hKdQ8eUX11faMHZZdj2AExB5hocKp8KwQyvgGVeGUp2bvsx9wp4uFy/3fa57RO1ugN1Rz4VlqttkwjhrGPEHiblYuFfq4QBJBIUc6MNRMXx+QNHn2vHo81pcDvRVf2LUj1nrtesHtU2B5BBmv/ewITfKinicZ1kX1e2kezzMeqUKlsslv5weQld+srJQZqC1zCqnMdLycqL7IeYDjrXG+NCPRCq14szjAj4lF/6rkkbz0ZnIpUe81OilSEPx/KSvSoOKOuen8boaO5v8RflZRnijP6jkZvrPjZcQRe4dBHXcL9is+uQmnH6gZh759+519QSKGiUgsG2qPq0VKaZ9FLvWcrlNLKlP8VVvbyqI3kYFqVcWfhBJ4R7CTtV1IwdhF0gdz72R5cq2VhBXeBiSiXPqpE8GFKcOD9thPjpqf1/E= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xtsy/o9uw5ozNiEomNGtl2yNgQ5dFVqnPyrH1RNAdiAau3aORFdHmOB+j/c+vFT/wGydhSptPslBwS/Ez2BAoox1CUrpXu5OVPaaKN3r72ZPFvEF/pbryUtRlVz83pRkB7d++9nYm3s2DIxuneQga7P24X1SKQOW1EUHmwBzIctZZVcpNMTOv+C9OKlo9pkHI+0o4Uxi2O9s7e6S0bPx3Itv1dL0FKh6XVZ4uuskfjBP5mTfZp1A6Yjr4G0WadctpP1WTfnNWARJX2B6iIJeYG3KT6pSkXEkivnBai99d00q4w5SIsc6zTC84W1+Ce0OagMyUwWkphj0Pw8T6yffoIIXu6UplYuT6TwVvobYBEvjcHLNqKgZRDEDqbS702qM9bWRS7t9q6kOp40KKHubN+/qElw0rFLrACUN+1GoPvBS5nrzRMf+hvM7bZ1agIQZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N1zA1RC6xCBONZcMfo7IoH/xbTnGTjyowtCwA9l8+36AUVaUPjlZQaLUMQxcwRxc6qqzrwgVmPe4a5hRuPRZZDNasnIYcVa9Gx0JDIjuDTNpjHN1TkewASkG6m9Rzcq7R3zvYmALMrFumJkX3Ty2bA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20228116-9d9b-41f4-0bcb-08d95d32b4a2 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:21.1784 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 03/23] avfilter/avfilter: Allow to free pads 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: 07GLtdcEihN0 This can be enabled/disabled on a per-filter basis by setting the new internal flags FF_FILTER_FLAG_FREE_(IN|OUT)PADS. Signed-off-by: Andreas Rheinhardt --- It would be possible to only free the names of non-static pads; it could then be used with the headphone and afir filters. But I don't think the additional complexity is worth it. libavfilter/avfilter.c | 19 +++++++++++++++---- libavfilter/internal.h | 10 ++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index de7501c37b..9ac247c251 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -117,7 +117,7 @@ void ff_command_queue_pop(AVFilterContext *filter) */ static int insert_pad(unsigned idx, unsigned *count, size_t padidx_off, AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad) + AVFilterPad *newpad, int free_on_failure) { AVFilterLink **newlinks; AVFilterPad *newpads; @@ -131,8 +131,11 @@ static int insert_pad(unsigned idx, unsigned *count, size_t padidx_off, *pads = newpads; if (newlinks) *links = newlinks; - if (!newpads || !newlinks) + if (!newpads || !newlinks) { + if (free_on_failure) + av_freep(&newpad->name); return AVERROR(ENOMEM); + } memmove(*pads + idx + 1, *pads + idx, sizeof(AVFilterPad) * (*count - idx)); memmove(*links + idx + 1, *links + idx, sizeof(AVFilterLink*) * (*count - idx)); @@ -150,13 +153,15 @@ static int insert_pad(unsigned idx, unsigned *count, size_t padidx_off, int ff_insert_inpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { return insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), - &f->input_pads, &f->inputs, p); + &f->input_pads, &f->inputs, p, + f->filter->flags_internal & FF_FILTER_FLAG_FREE_INPADS); } int ff_insert_outpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { return insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), - &f->output_pads, &f->outputs, p); + &f->output_pads, &f->outputs, p, + f->filter->flags_internal & FF_FILTER_FLAG_FREE_OUTPADS); } int avfilter_link(AVFilterContext *src, unsigned srcpad, @@ -767,7 +772,13 @@ void avfilter_free(AVFilterContext *filter) av_buffer_unref(&filter->hw_device_ctx); av_freep(&filter->name); + if (filter->filter->flags_internal & FF_FILTER_FLAG_FREE_INPADS) + for (unsigned i = 0; i < filter->nb_inputs; i++) + av_freep(&filter->input_pads[i].name); av_freep(&filter->input_pads); + if (filter->filter->flags_internal & FF_FILTER_FLAG_FREE_OUTPADS) + for (unsigned i = 0; i < filter->nb_outputs; i++) + av_freep(&filter->output_pads[i].name); av_freep(&filter->output_pads); av_freep(&filter->inputs); av_freep(&filter->outputs); diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 615b725cab..d9ff997e72 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -306,6 +306,16 @@ void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter */ #define FF_FILTER_FLAG_HWFRAME_AWARE (1 << 0) +/** + * The names of all input pads are allocated and should be freed generically. + */ + #define FF_FILTER_FLAG_FREE_INPADS (1 << 1) + +/** + * The names of all output pads are allocated and should be freed generically. + */ + #define FF_FILTER_FLAG_FREE_OUTPADS (1 << 2) + /** * Run one round of processing on a filter graph. */ From patchwork Thu Aug 12 01:43:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308114iod; Wed, 11 Aug 2021 18:46:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEwQYuTvJsdhswz/qP4UVZTKr8ZvlPwbO1TQxxSNxPfO2MzGo4cLAy1hAxr6QoEh6Q2bV/ X-Received: by 2002:a50:c88d:: with SMTP id d13mr2351100edh.334.1628732764657; Wed, 11 Aug 2021 18:46:04 -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 c12si1303939edx.372.2021.08.11.18.46.04; Wed, 11 Aug 2021 18:46:04 -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=GqfKk8OW; 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 338B968A4DF; Thu, 12 Aug 2021 04:44:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0011.outbound.protection.outlook.com [40.92.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A843B68A2D1 for ; Thu, 12 Aug 2021 04:44:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DzxO4HnN+RhrOcfRl1fchXRReHnUOmRUVEXkBaNZ+SvFXt5AYnexemxK/piAf5sNfiocbb0jlhSX6l+ZKNOyMOahh5Fsk0951CAJ0tDYp5v1BWNWkCOB7nwJc/Ujjm2G3UKf3Wxd/ab7kLXf4CWxRmXZqEVwFSYYckzsU12hRd+VAl21EqetFfexdXV/lESPqhkk7hWtSqq485G3Rq8NfeBofVXeCTC/d7M/QYkiQd/uxCWADI6OhZ18t/yv13AfYwHftX4yi88pIi6P312uSpc4hcDIwy4UaJyPPVYWGCUoxcHao2bnPjhBxCHWmcyHqj4Yo/tLx2Mw0B373CGNgg== 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=EGd2cFPASgWQifqImEjDvoDu4WtgCUYFpRBBP97a0Zc=; b=aypT2qOnIBossO4IN2/4GsFm7CfcBiyycT2JoVfeToM7z/tr4A/9ERykq5RFqjKhx+6xiG3uD0AIH9xweO0yez/tSLdXCtMts+ObwwfzyNAE5LjuAw0F1mW8+v1DMSeZV3aP3oEbDpfhYRiEjQ5UZ/MWOkEPn9tHC8aoJKJpSVbleom3WZPPjFYF/FImsyiM5A/bBYU0wqydFxo0fiXuZIrjA80k1fI51mBfnu37lFHONAZxISr2l/V3LLBM/AYO0BYxZrRd2IOI1Bl4DzA8W1RsLnlAHVP7Wiv0tPQHUarZJi1tkMBJlCDFqjLk3sYqcMSsi7ILxbpP++R2F3w6MA== 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=EGd2cFPASgWQifqImEjDvoDu4WtgCUYFpRBBP97a0Zc=; b=GqfKk8OWLLkVVAQYsP6HmIZhX7p9CQyd+fZVZxQo2/bgeRXVnD3BAzZ2QRXd1nQ00Twy5uJfx61q7Bekik+tQ/+HTQzVba8ifAgxx55EigLn817TnXzSpYSj4ALtmQ9ZQ5ExvF+6waMyn7Tw5hykTto8S8a9YDRX8x9i5zoE59emtVXsbpS2un9qjFV6ThsStdeRbfYDqX3s6LXW7Pt9/sX/mWK5alg1f3dlYRF1Tb+uaw+PVoVsP0OT03rGQlJIXI0AjUHfearFGiV3OzcgWrKtUlBN+MQHr6J3yMc/5ySz0B2ufVh1Bk0tGpK4tFNaT7hnORpbBxAEkndcKzgDnA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:26 +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:44:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [o+XdTKjeMAXMNuFuweQ3YSgaNzOfToB7] 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-3-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:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94edfa2b-a972-43c0-2395-08d95d32b791 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/mf+VDNl7nV6Myv5tzHEZZW7SFxuL3ufXOc14z3NTOcNqaOATKZLiph917j9mH3nqI+CvH9ikFFty02WiaWEvSWajK8DSXiRluOiNJOWv3b/8/HHfq0n99JIyXb7FPMOH/OGObaSir/Iw7Kj9wV28xKXIDa/KqBNkhbD8cLzDgtC0l8F2Jy98j5nhjTDhUPNTDj7PaeCGif0PmnZHCdWhU19kMfRH2tcZvL1zMJAxzibkBWoY3jqbE4goGZ0/ZVZGwi4Es0A4j9lmBHG1GWRMqs4jO3pTWz00rapYDhvlP497cpSBh5IsBAOVmkxwQ0HM5yMzSUCl0MgmstEyh4iBFq7cM5WGFEvw3m3DB+MZ3RwiY4cg1bUrdATpUmZHURpaQH4IllFkoWR1m1pmmKvX+J5wiQNX60Ke4VBIZ7xK1q2Rwkg4/MoDWvwp8ktts8Nr15JOoFVDF9XVmIICOM6YQ3Wfjubdu3tyWHbXgaDM7cVr0B4M7W7JQArBA8wnr5SUV304WSdwUJw+Vg34jrK2PPPAUUCu9OngFrylDRobwZh0oXMzvvbOaGqy95uSONkWJTOzFB53wO/PAdUH3QF/hwPrFzRCxDouUCRJp8yO31EebnVQEh0gN+Q1AsUjcIpTAUjpLDpvSGMB090kVHNywM8OKRJifnX9e/JcK1vBy4eiJJsXc4y1l2Dqta+kNkEw9iRV7nttk+Da+aZKQf/Y24= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NTUzpY2tKlEesQyGurDPJrCS6bke2htPPmRoXH0Vhhfwpt4jPhACS6w1TpdRTE6W/mmSewx77mvggDJYThLZy7IS3kKFRtd6XnV3W06ZgMdAr/kuKSEkWxxU8eU/oSSLVumD9ziaZ70Vt3mYEAO2inxepLuQHqPErYLDDLFjtwuRweOHxQdTohPlti+fv9zQ/Qr2tM7gfXTP7g64ygV+8c6TbjWA506Ky7g1wcoEz6qTBtu8Q8KOtqU45kXlFnEuCDJmx6nVzVv+ik1vfehyd/WJsGyoUC0fYQIK2eWHl45kew4ojljwMiTbmEMf1QQWlUiR31fs/WOIxEh08w3Ue0FoCJs0lQiD/LNlyzP+eD0ABF0lJk54Uryx6fQk4Bj3vZhZNnDbJu21VRGKGGfHscAnl9s4+VoMrU4cWKz4VHZjxiEtbpv5jpI2cxq46blL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l1ryTNNvOXTBZvtReZLbIR20zo9FIUTSBuSJB7sDrm9bWnfyAbnIQnVGKxOgsjzQMS8HGmtuvlicNuoow2czPJyOApZQ4eOpXFQBLCmvycwXX8fRxVworEFjPTsAQkeWcQ2snsEwgzJA2XWXXDEdCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94edfa2b-a972-43c0-2395-08d95d32b791 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:26.1356 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 04/23] avfilter/af_acrossover: 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: apwQVxXs6B+X Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrossover.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 3ba67b30e1..c99c7de1f7 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -191,10 +191,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.name = name; - if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) return ret; - } } return ret; @@ -550,13 +548,9 @@ fail: static av_cold void uninit(AVFilterContext *ctx) { AudioCrossoverContext *s = ctx->priv; - int i; av_freep(&s->fdsp); av_frame_free(&s->xover); - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static const AVFilterPad inputs[] = { @@ -581,4 +575,5 @@ const AVFilter ff_af_acrossover = { .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_SLICE_THREADS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; From patchwork Thu Aug 12 01:43:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307565iod; Wed, 11 Aug 2021 18:45:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2lObXUPqQ9y5oyu5UeiTsjnMUuHiHGJxE9dFdskxHseIAJVTgdgeAvWZ1St411nga6n50 X-Received: by 2002:a05:6402:1d19:: with SMTP id dg25mr2368477edb.153.1628732705870; Wed, 11 Aug 2021 18:45: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 bh6si929344ejb.691.2021.08.11.18.44.45; Wed, 11 Aug 2021 18:45: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=USdnx1dN; 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 D12EB68A44D; Thu, 12 Aug 2021 04:44:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA45A68A2D1 for ; Thu, 12 Aug 2021 04:44:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jW+5CW2harWNH21ve4Q9paoPYhYnaRUq4BWj5TesrQKAsTB45uEXHqVsbiHI1H8VSLsfLHip2sVX2QdnvzEHIEgB/iMpCldPeoBtT0vkrcg29/IuIJJrLRyN7amGGZ4ycPw4wltvZdhshrJSSwbw6C6TIhXATkGaFmmQZSZCr5utIB6ytF9yxGyiXuZObkmVTnlbtco98PhSPNQhsWZYgAeHRWna5buCcVAFYy83Ff3tjbmk5ifuAmmbQoAUERC/TiLOd4yxpaSMmEAK5SiO8v3XrlkRpdsV/BOPQSom7ohRSNDBn5AKYai26VYRvFrXEoy7IfdyWJUUzy4VX2foqQ== 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=rG8aJnB5YzdqpgFbBZ6d70jnaSrSzwV3ziCrsqkKKJ8=; b=E8qucQgsicF7P7w8cl0etZwW/WYniLR2ISHo9S2jHexyCMwQUS9Z+IDebK1kttnVjnCrGX59pwSNJkZm6zCyNVD1zqKENa+OzWtIGWfmNalhZA44F3e0orFRo6jYRfIKrxNx87HhxJTdRrVlDsyoir0Vy5XLxdNSStb3/QXKyWq8yl9F9PexQdU7hQovUP8XRDrM593McN2A8JiFXZm0wOrQbgHKPnNK6ViQHMj28NG1WUCnsU2uDUIyBBKY7aMNegKc95dy8SFlJa/vu6tzkbl7ueCBBQ3U+6CNqBygt4M6+0cvsFMmod59yCQCNjF3FL1noDyoyfAsQIvYA3c6tw== 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=rG8aJnB5YzdqpgFbBZ6d70jnaSrSzwV3ziCrsqkKKJ8=; b=USdnx1dNtPbPWp41BPDCDw47DUKpXx+8H6EwxhjvsmxB4NY1zRySh0ckUpfUjCgHzTnu9EDx8l9XLvvwZJfNfAtDy+wOmQVIiomLzA5Yxl1Nz/IZOhDEs1jDIlpXfG1xZxjn/xVhxAojU38ybMo7eVNvRYAhRIq5EfoLcLQUsX8RunyHnPzXuzfE78yFmGjBuiBlrxXiDpSlDcwLj7epgPzoebcVkkMC5lkrtTQ4768QVAYZ1x9jo/slbnR2DZv6n0ivbJcB9PAmiOT1a9j38qFuWJiEcvGv04Il9Rsl1wzlTCUCILrJ0+2OP8n54IEduhFZExfN26zLYt7Y2GweuA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:34 +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:44:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [RZLTwgLFIZUM2h0e5b82iwoydB3AcUWa] 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-4-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:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4402925-afd2-4dde-ab11-08d95d32b7da X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR10VeFmxskfnAS2/vTcdsxNzC8Q5Vm8+260Zmd1fpqRYFUsyGLKqQ7sr6M5KmJlHIPHCrWzte1hE9PQdLqjnrd7NDDPurb3mwRoTFkBLrNlrrPIc1m9ZiycNk4LK0zR0h4cZ++KKYLUZhGoqYiVi+fCHx7DUNrUwsmY4kbU1hTmi69jjzSQi/Du+IHXdCvY1PqIU79vQ6TKnYODMIC98vhFoVNEjGwMbwVbmCchXCSUbGR/jsyGX48afhCi6FNi0keAFhsI6M+QF9wlb+z0+gAY7Sp6QmtP6s89+V8PPMbeXMl6lWrGrPiSJg6io/uLYS3PEhr1jhlyOMV2saLtVa0kG4Ku8BB3ireUKyxJXQWgj1ZsQwMtWm6p38IAP61u4hCho33aLJgOmjhOonXhD8N0sBu0TyL/SRaGe8KSAdHmG+fy7WNZNOcfXpPCnYl/MJhOiyMMqrok1if+cUWmvcJJb9kCVvgymC0dQK5y/ImciZ8s6fCiZKlJ9/e8nwr4FU7MSjk7OaFYCoOyf7b8HlFP7VBDEhKCR3dlTTvj99Cj6+vLg+96yxc6Uuakfn+TixZFgZuTUbGR1Mo94Dmi83tBs8UFajIK7716BBY1bN6s6/E44nZ9zb3qlp+McQHQ4+yEThxwgDXDVBGI2F94C+OgZbfFaDZuroPvCB7hOJ7dzyLM4FCBtNf5l++Xh+POCnnu1uHdP1jKSUI5QCon/ExPY6eemjq8fKz0cZ2e+9fAE= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C/3S8FUcCz6aVHiYf4VrprWjsY1vnsDSeo/ebdJYE28eTdRurMNur0Bo1woK/zDnzBmf7EnhoYSQ5aEhQZlJd2yAy8S9Ps5S1/QAvmygzN3fd8a9TEY55uwdQkFKsNHV+V4QJ8e5QwDZiNdRq5pBpPLZQoeQ1G+ycDs8ZHtzoKOKPCHqu35v01cFQYWNGSH/pdzGHnofxP9nzulb01y9Ow9QyYQ2t4cn5205xCuUFV7vs9lL5kwiuwoCNU7BOLsrWmXZdWIUF06GtbfcR00czuj2vNvEr6XjRY2CSvKdJqS8YqOXZXR6cv35ADtd6T4LsMJfIcJKlIQtbv6CWudhXCnochgYCSx+qEhf2OJFJqmWFzvGBO/GsxH59mlEltXqQMxix0o+ogK7wd6RxvJyL/gdnf/63AS3F2Fu9V3X0MDLLuGeHVlPFeLAaVzRGhED X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LLqMmcJT8NhlvMfEvEsgU2D5VwxaHJWibznpK6MJ2a1OuwGoOmjJ3fXkZXUqr3yZ2KGxNvaysakORGbbQk/XPuj2tHpw+FrISBm+JMeNWmjOSjY1vQCfiGFlOKNlNVFFMLbvLRclrkut7QrXhWZSzg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4402925-afd2-4dde-ab11-08d95d32b7da 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:26.6692 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 05/23] avfilter/af_amerge: 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: hlyEEHh87pBR Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amerge.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 2e45b7c277..1b7c6dd2f4 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -60,8 +60,6 @@ static av_cold void uninit(AVFilterContext *ctx) AMergeContext *s = ctx->priv; av_freep(&s->in); - for (unsigned i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -330,10 +328,8 @@ static av_cold int init(AVFilterContext *ctx) }; if (!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; } @@ -360,4 +356,5 @@ const AVFilter ff_af_amerge = { .outputs = amerge_outputs, .priv_class = &amerge_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29451 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307622iod; Wed, 11 Aug 2021 18:45:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdIjuipmUrzyqnq1zA120C9EZ8X1BIGAsdpZ/IinrtO/niXrzPC0KuTdkiSQd03Y/cyqYQ X-Received: by 2002:a05:6402:881:: with SMTP id e1mr2485592edy.53.1628732711483; Wed, 11 Aug 2021 18:45:11 -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 5si981603ejl.332.2021.08.11.18.44.57; Wed, 11 Aug 2021 18:45:11 -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=BiA1aO3b; 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 AF36668A2BD; Thu, 12 Aug 2021 04:44:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19E7F68A375 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a/BkVkSQI+wXiLK2qa0Vx6C0E18mncYl/MAtGDchlnkgiVJk6lWEp//uuPUzHjQEb6vEWgmMGsJFyJ9kPmnDs1x/qWKmdwAw69zd1kEYXGxvsPmK6q5dY/rMgNyZMvObvfbEZw05Mj8AWLziSz+IKrGa2SNYyxhU0Z8J0fHS8Hhu3/J0I39YIvxlDor0acEMSg1y59pbTpeeC+kK9zu3V1YAm4Dq9eC1LNHGivOgkDtbrP30kgYUelfnSN6b9gERcF3BHP8tSRe76tDlnsXwQEzm4GAFXQtmXAmKDcm6f0f//EkVAut55b3Fs4p16HFaNkMDRBj7RlSsGXVNyjfyig== 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=OlR9inuBb8ipCf5PgLF2M0sxKflVUluPEhcYIayoTnY=; b=W8LSf1a+FZJymvNg6ZoLl7C5OWrd6YBoJ+JZ4zStmeVHVjtOeVaVbkSkFjebAFhsRAC9N9BNHrUP50ECjukgpwdIekYLI5Eh7RuSg6Qk4gVuN70VKNPurRKxj0YOdJuAKQdbQGTGRHAhwGeRFonogxW7w09dAlk8V8BPhmnFUjhfSsjpGSbvWhREdMzl0XyQJr7xt8QmnAbOLaGzck3hUMM82ZmZ0EptCRg2FFx7htY2S5jW3Ga8PutSyc74lXquqhVsqEHFjS3xIPOI9GKAGOWyFC1ZdQ9yI4hPQ+M5HW0ddbQoqMldi7qFxn99WiVo6YOR2emTQx7kXYLnhfbVgg== 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=OlR9inuBb8ipCf5PgLF2M0sxKflVUluPEhcYIayoTnY=; b=BiA1aO3bwJ73oDtPTN+M3DSWSXuFR3g2W5C+/kOrzXppSYSYRG1ruWaRwAH0yHv+BwVA2s+cstYkQEPnanvuAV+eRYMwHxnOBQVyBwyC2m8JIAHEXoW2CqMS8ncZsl0v9kzzeZmmvdQynbQMvYt7iiKGkELZq4PxSZuiin/IrP0HxBSCyNUSoqK7+qGiTfoGf+QPmMsDTPWHkbxhJFiMYTA4kQwTRnRTF5EF+YUmgPaV1iW4t2I53v/d8oz8/8myPs1GlLwkoGmlftaMCT5444Gm/vOo/V9wiSt/Hs0BF8h2SzYGfgcsarkG2TC4S+myjQVFsbzecXeb8rbgWleLNQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:34 +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:44:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lRogSS00LE5fHNQv7wYMVUfb/UAFcizX] 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-5-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:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b1ed845-9411-4558-5673-08d95d32b82b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP7G/layAYzPjA6QtGFLAADMeieAm2OYbUmn0jldldlH63amtjVUyjGDyKMNaWGIJmJXs+OzeE7QCc8hiyQZronRYIuxbf9suDaVOKJnwmw+Wu36GyhkXcod/AYNGzoe70JRJkniZm25TI5y7rI1hsvTDw5mkgsq5LRQC9PKB8DLOYt3cZvSzp87YBF5UxEdIFf73P29mC9O/a97eM94w9WRiBftSpIxF1ovFBOsO9HIRDpyrwSt1TtzRN7Mugqr3PdpHecXHjX2zv4eXos03zO5X6CjbWsBCupw1DIHn05FiOSs1UiNGYhEl370dTIF9/J893OIRbVHUW3yGX6UGgqcz1hnChEtMl7Dv9HFrum/3MXlDni8j9voQBLxaH52v/2oNbDC2tc54JdwbE1iWymdKplvHkdBsSCYBz1UHgnMx6/fcGXqwQkwLF7AHpvppubYeclgG580l4caJduPtj8aY5pk6D/2JBuMjYHKmOml28vpahrqU0VoFRlDUVFiLyJq22x8+2l5dyNfsHf2G6xUCypmT/hdjW04GeaZ4IA2j+6BbzPZMfAXKlq2GOVsYXJPN99/3coKtuW8bEHfgOHboqifOfWiIfdTtd80+lQlkKQzHd+BgTGeaHw34Fhb+7gpcD/3A9a7kj6jZKJEwiaun7u60giv1CFPr5pDg7LpiSrvuL3oKlzpnD/nlD4a/DDghZ69ZA/iAI= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yZZsmlmpyNSr+xS0xsORptUH9681InKnI1NXMgvk5ogby+ss5Xt0w4Y+/LIT1pRKaz4CIRCf9AVOj/eN7te31QrDGSOpObbHl0xjR0yyv4nK167jnXgKObguc6I2jt5yRRi63PcQXx/VlyTbJn0HmYzeIKnsZ1Cq9KNAMBqX9s3yX/PkHSW+z/Qy/ZthPqWT5WbfWaCTNAnfewhpQph3/1tuFo6fC2DhOaZL+c7xg9+P5aRBcu3Ma06izhRkcwkD3EenFAH4PauVu7Gl9SgFP2HDkPthIpdM+wbVuX6+JtMzsnfsbXxh1Mbt+ZQS0hgQ0Ck4M92+9Pt5FQwfRJh0rUgwndgZrGz2/g9vkjwWRm4rwtIq7g+2w5SRgIjlV93lIvOM+wfYfHeNp1QqAXb9hROgYPgBtfK67nOP7mnzU15HPDBiHk7G4Fwb/YbCkYBe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1NBGe2YSsz1yyoIrcQMjRh3PLW4M4YdK6B500dlpkIyAuyXARPq99PKZyxQtQZGKUsZ8hbqQ/zJykG8K66IlFhOIj7IrkeLI0g4uBPUvIKz6zW4SNH6j3RwOG+ql/zKNbNc9jYs9bkieVzUBYOhPTA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b1ed845-9411-4558-5673-08d95d32b82b 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:27.1422 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 06/23] avfilter/af_amix: 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: 0/UxSGtKBPKK Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amix.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 2296b49243..d5af72bafe 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -553,10 +553,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; - } } s->fdsp = avpriv_float_dsp_alloc(0); @@ -589,9 +587,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->scale_norm); av_freep(&s->weights); av_freep(&s->fdsp); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -650,4 +645,5 @@ const AVFilter ff_af_amix = { .outputs = avfilter_af_amix_outputs, .process_command = process_command, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307601iod; Wed, 11 Aug 2021 18:45:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMDSZX3N6EiGkg/bgp8sbkxWU1fEEG5GvwXdLxKzf8DnhvyAyHLqsoGk9zYsZTN5sNt/AE X-Received: by 2002:a17:906:f854:: with SMTP id ks20mr1333003ejb.421.1628732708775; Wed, 11 Aug 2021 18:45:08 -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 y2si1081872edv.102.2021.08.11.18.45.08; Wed, 11 Aug 2021 18:45:08 -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=AtcsiRjm; 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 7E20668A473; Thu, 12 Aug 2021 04:44:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ED0568A2D1 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MxHA+/Rw0pL5Td+ssogKnxl0dHVXQsK97IzSQ5GR4a5xhJ9eGORarAFH9Ygq5dBpuzlr7icBcfkUSehcFbhUoW2NxLieI/yk8lgv4t+lEOUBYnOnY6B6Kmb0nX14S0JbC34GO1ClbAHY/Swj8ilcACmbnmLdvLcNdkseJu/T2SAgO5VprNxDiHbvAO8B8r25mb4MkUoT6h8ybnSjkjvHvw6Kp8iT/sC7097fGj7fFAb6uudOtS5RCvNvo2F/b3tvchWPoROsg3uDdMr/o4tR95BSeKJ9GoyZhemlTV2OsWZ5HrwLRUYRaTEh8TpCEgL5f56rzr2nd5hHOZku9FFYSw== 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=kjvWln5GZ6xZsSPEF4ACZ7vwoxa12tLsRoFSbd+9Y38=; b=hASBS3OrIf+iFlj1sIDXe60TFE2pYJk7GVjZgxA23MSsa5aKDn4qqAcYOL6nmEz06cvrpFXWZRN4FEuSO5rJhd4avoKlWo+nql9HIKQLD4a5O2H15WD0RqNrDr5wgyq1dB9kdR9MrYstgu8NIObmWSfzhN5nEFrvfVhfKfNTp3SEqPVFlSaqBAfWoxb3N7zblwp5RwHAvSa/xq8dwXNeatBrR6NSKurhDR/Q+yu+wnBPob7/3aHcYWQRo1IkqbMjX83TsyOBIBbJ0mP9gfTd64SN3QjcvmsmmIgGzmUXX6tklM3DcZILXmum4tqGBrqARMpgmJqw8t2kFjJeJJkjhw== 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=kjvWln5GZ6xZsSPEF4ACZ7vwoxa12tLsRoFSbd+9Y38=; b=AtcsiRjmthg+oavksftoaRMs4PWSu/h7EUZ3Nvx0CBWMYSFM3LwLPolQa8FPXliEMXo4bW4HOBlzXIZiJS431g2KZJFbeizGdZ1T+Vs8wyrBUKDL4rAA6YChzVVo9gSKEatLZufyvpX6PIT/mrgX1SH4QL/gzCYWjwWgt23kuma6Q9auR2HR5jnNiAqnloD/ijpo/z43sJJFQgNT2ZCiQLqAkajt4uQT882qa170W9gP4gOltPrHhOQDeKJ94m3aGgMS2h2CMJhmSvxQP8o7PhAbKJl3dMGrPmUMq/0HZJ5OfOIZzW+yRAVDIzH8RA13Z3+WWB8Ptbyjo9wXrTpmpQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:34 +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:44:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [7TKIMcZOYIIwmgjmq5pXwFN1Jkrw3P5h] 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-6-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fb13cb3-fba7-49ab-798c-08d95d32b875 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP7G/layAYzPjA6QtGFLAADMUGGk5aGFx9yL5Wvco7mdjIBF99Sy3RSw8kdK4179iit0xg809f/S/4WNxbNf5Qq49JuqmlXDcCh+HDL8n4sI2ODP4dHh4deWxf/TJ8LenwpS62a/w7W2NuP+QdAGTIACwc/3s24j4WKKtqkPpGWqYPdwEMhhMMHZhN6eX+tqdhORDJtfYR996i5vw/K1qQiSrdbPh7NjLX1WbvGfASDM+K14Y0UXRizpDqszEMLRHwtqeNmdZvlTW6PPXjleTADlmIIeIbJ14uPGtyj1ZiQLqsMgfgittn19fTsj8LJ3fREAlklP2iQbxZfN5oVuQy/OdhoaiHUD0vsit4KoLioMLQRPEzcujJmA6IFafH5WKv40t8/MY5xFnQKshma9oJPXwfLDozAeRLVGHiIHnrHgEiXAlou53sztVtRVTxBrBiE6UEQXkiwnbyJTB9UMaP2ygXlyi00pODQAEa0PttARhyChjBsb6qivT9zHE9/B6w0silP6S9fLndVmVIHTxFU4CXOneBvY+SBA9xDiZGJFYTphA1Ele3Qya1RutMIk8aozsqleMIEFj615XGkq765jgvZSP4Jwcno+lOvb6HzouopSogu3B/Hf6DO5cf3lxdYi7IYQFEW/v95fmFSdwa3m7kL0tLgOCan6WRPdNI2KycprpiqbEc04z45r9kHlkHx2Z2MF87LClc= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NPi2RZNYUGGHI1pa3JDNHdAjPE9FmmrZm+n8cy4DsSuSpZb1T1HCA3sSQrQgusLNF5RnG7TG34bcVjHysEngCrzFqiFWDHrZhl/Gzb/keJrsMurdUGbYfYimsWB84x4nzJDZrQm4BkSw4Nzw53CxSQy7mPHIAIDao5KI0l573tXRYth1FKs/b2KpUSWsBg1yn8LeppPDOB/SLkKY62Qmhv24nhG2SiJ3vIRuqthYINJv+0WgQJNaoX4pclmBuFuNIYsyBQWCOdxBeqOg7Escgh/C79I+IHOqEw/J9I65YX3uoiK1tB1RyfC/8el0glRF938tYn1gTPCfDA02mNxt1Q23QcQdBkM2k+ibY5oCkxyCGO5+drpSYTj8HXEZTx9pWhJRha+e2ayzSfuAZ4cUeCJLq7c7cfoIa7sj+iXHZP4PMx/McjkNDOHBai9V46jG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QVxKtH+F2WEV6FzJfY3xyGMhykOqbob3UsVVByr2nGEImNfuu63hQUtQEQOBTEhQAZHvuEJitUJ57bl58wM95qwQPXQ+eCT6F8NdAGs/Fylra+y8I0TqjMLAxjgQvNkSAeYtkg2qjSFA0wXHuDWMng== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fb13cb3-fba7-49ab-798c-08d95d32b875 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:27.6221 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 07/23] avfilter/af_join: 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: 5qXD00hc8XTa Signed-off-by: Andreas Rheinhardt --- libavfilter/af_join.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 6a4b449021..1fb216f622 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -194,10 +194,8 @@ static av_cold int join_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; @@ -212,10 +210,6 @@ static av_cold void join_uninit(AVFilterContext *ctx) av_frame_free(&s->input_frames[i]); } - for (i = 0; i < ctx->nb_inputs; i++) { - av_freep(&ctx->input_pads[i].name); - } - av_freep(&s->channels); av_freep(&s->buffers); av_freep(&s->input_frames); @@ -552,4 +546,5 @@ const AVFilter ff_af_join = { .inputs = NULL, .outputs = avfilter_af_join_outputs, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43: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: 29448 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307685iod; Wed, 11 Aug 2021 18:45:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4trhlG0w9WnFMTYVXTf1kUAQhSPJqNR7ESQvgDCkZj19hXh2o2EsR7jUWt4qkk1hOQgJj X-Received: by 2002:a05:6402:184b:: with SMTP id v11mr2377315edy.267.1628732718554; Wed, 11 Aug 2021 18:45:18 -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 e11si865287ejx.252.2021.08.11.18.45.18; Wed, 11 Aug 2021 18:45:18 -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=NhmSVgqe; 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 7732168A3AF; Thu, 12 Aug 2021 04:44:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4384A68A375 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mSVn5ZqYuALOXG9ikyh2grolDSot/+eiqlRe6dLctVD+Ro+FkBfd9NLGUton7Yw/lnPInIJPmDyrl+FylKm1hzemUerdMqp4muAkTcr0xR1zdgZd67FCHNToeQJTVe8ZmyiR5Byfs4lWjYJYqWEJay7jYoYR2POlMoBH4q4QeFE4q4bJWxOnYJdoXzLqY/noduHM49Dnv7WjCyl8R+EDnYfAXaoPxwJYeftoOQaqjKPF239i7E3sydmB1fotakkd78cVaHPI/cQOQTrZT9eA4JsFCkktJKC7+jui5wcEytOJhYEQvfjGw3csdgw8TfFqyFxKUezereQFLj6L5B9mMA== 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=ypnNXf1HxUM6uk0UxHntj/11YMFAA7VggfF0ItcdUVY=; b=aFnYKj6KNFqbKVT2taJLoCPKjl0eb1Dai9j9dKEcr23hoxFEqpeUonLQGK7ySiSfU7C1yQ5gJvos35pACOTTOS7Qa6RF+paBZyF1FsmMDPetqA8ru2y6I007uham6H+LjgliKTeG4qGgO9Jm8KWerR0b8gFXH0CuVwF6VLig+4eNl7cMj2Zmmdid+M9WgMLltGTHAhRiJ7KAx7V1MMsxDHrHyMLPuecheqScTyosrbCPJgJRkLYeM8VWjr4skVRlLLkYYQpTbxGtgdZkWs3qu1+4zMTsdXU/6KzFzsHofuDZksDKkkMgSTxDP9Ta5PFCAXLw8b8NPXG6GEV+kd2YBA== 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=ypnNXf1HxUM6uk0UxHntj/11YMFAA7VggfF0ItcdUVY=; b=NhmSVgqeXGegRJjasvT1zwNfZ+BQzkfat5NewbtJ0eT1gG3MX9AJ4ZqIR9/BDeCj7+CPl52I78tbMa8tDB00TIMeMKbovVfLdiXHFl2oXbYs+pcVzsFq4QehCGJqoTQMnmDCLV2VKQ0ciRHZR12Pe6vWZBM9nSQuOexHTB3cXGrhXvCliCxcsEk1QKsEudZ9Hf8N6xjhVnTY+paUsoheeT7nvuDKjjecW6qhFrKx9euWqaUHlZlD8gGag6eduJMfotZtpUfiTuWyXAQ2M1HwWLbh/06JYei7BqNxzarNEITfRaKhTIxhB5IFuLPU5pFqwBwwqE6isS60Wg7Ke5pzIw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:36 +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:44:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xrUYOD3PYQPfZl2eFNNQSfEGTG2PmEUq] 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-7-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e6d0aee-43e5-46d3-8289-08d95d32b8bb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR10VeFmxskfnAS2/vTcdsxM7NU1/SZ7WIFaYS1xOnfaWNeM7olBqiPRWxTrdHd9Ze/0bg5LtsIJceGVdIiGRwcyHnyxpzb/0WukphvuFxXD6WrDgd6DCRHduFAZt961RlaSG3X1GR/ZpogZfdvtz91yH6zoiFGEilee8FhJgsUL7Z30TMk1ynKRBzJRb5+sS5aca+c9k1wNxMjrApd3i1TcsJIrdE7RS0G/WOuHfBifKwFSCOREGQt51LxB3lz2QywK+w2k8p356UjccfKAeE473ySkF57ZJHD9IZPYcWv+Goq4+OrnfJq11+7qgD0jw4VXfEYpu1ToSHWhkODhu0QfE2oq1Mq+f/sH9KZ19VwbQKn/wR/wncHJPm/3TPRd7SGuKny3OiLVvLrAx8YuCCScEMceTBjdvLsR3pRA6s7XOPGRVi/Z4GEgOkkiWobmFa6L3yRmQmluWKTTbuhwXqutPCoebNYL1AtL6N0g8eeBMN7Zxhkvgbpu9j7I/VpXBJihoi2ExgQgqLdh/dmf/kLUK7hI83UmQUHSQ2Kgup14ZsBhGdpFvt/YF5EOKaeCuSKaJNcagAHWn4f3RLy/9+NMBhqrmGWhRZdwqhsFVNVbJETxZ+NvqR6EttlAkSJWkg10qGzX8ayseCE6/b10Lc9Et3QoWhTJvgUPyS/WHJ4IJiweLS7eoXAghmKL2ltPOmZOAOPzPn+JCIOKBv3NKIyzGiJ0BlEFbUY4y2CDjoLvs= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lj8I9q48AlrFL7lf9nZEKDPRh8BDFpsNnJwJiyze7hFjJEgBT9B9SK4LNywtANOCOEBWmr5TqVlRN1kv8cKbLayJoSApTOs2mW6H9PmzysjzjXia9fpgpYIxLFOiKdNUxmwhwvsNi0iu8UDOYtYVeRpy24H631ok99whtiLw/S0DftgrB4qGw2rt+VZ1SnDy5+z4gtrXvlaOnbTTTsNNhbASlFQ0Z+4MCJAOofURxn5FySP1oFolhpzrJu2hi+xXjaGKAmY+D0XPyLgcE+uRIcACUgY1fdK4IFktFtmwkmfm2Dd9TIl1xcgEU3eYMTiMfHzSWGzQ9cNScaavNF3tHccKEQLwBlI5FNFQXY/Kz0nYiCSyx1gFBhJf1oU5kem6qJ3xuw4KbuS3s7FAL7x683j75RlfEcSM9UVJtLnSXYmGasrER9VP6SBYB2EN5eGC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yld2b7NOoRQySjjAJYJ/dfHzhjnU4UyWca4lAdy7+YkUP4Z9fs85ao7gT/t0pqgnR6EfiliENo9iwB4A8diBPrR4p5H13MYEhAYCEladVJS8fIct+KX6RLtyJYWfQynx2XhT9AEzMOYkjEZBW08NnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e6d0aee-43e5-46d3-8289-08d95d32b8bb 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:28.0412 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 08/23] avfilter/af_ladspa: 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: 4jsFkQo/l0mS Signed-off-by: Andreas Rheinhardt --- libavfilter/af_ladspa.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c index 4060251670..cbb8282988 100644 --- a/libavfilter/af_ladspa.c +++ b/libavfilter/af_ladspa.c @@ -456,7 +456,7 @@ static av_cold int init(AVFilterContext *ctx) AVFilterPad pad = { NULL }; char *p, *arg, *saveptr = NULL; unsigned long nb_ports; - int i, j = 0; + int i, j = 0, ret; if (!s->dl_name) { av_log(ctx, AV_LOG_ERROR, "No plugin name provided\n"); @@ -639,10 +639,8 @@ static av_cold int init(AVFilterContext *ctx) pad.filter_frame = filter_frame; pad.config_props = config_input; - if (ff_insert_inpad(ctx, ctx->nb_inputs, &pad) < 0) { - av_freep(&pad.name); - return AVERROR(ENOMEM); - } + if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) + return ret; } av_log(ctx, AV_LOG_DEBUG, "ports: %lu\n", nb_ports); @@ -764,9 +762,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->octlv); av_freep(&s->handles); av_freep(&s->ctl_needs_value); - - if (ctx->nb_inputs) - av_freep(&ctx->input_pads[0].name); } static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, @@ -803,4 +798,5 @@ const AVFilter ff_af_ladspa = { .inputs = 0, .outputs = ladspa_outputs, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43: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: 29456 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307769iod; Wed, 11 Aug 2021 18:45:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmCcD7zOZjinB1opv+KxV5GtGSQm34lD/hloaBD65VGnTLnkfksWAbApP+vlDXrqCoYWM3 X-Received: by 2002:a05:6402:1cb6:: with SMTP id cz22mr2397471edb.148.1628732730847; Wed, 11 Aug 2021 18:45:30 -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 dn18si1115816edb.220.2021.08.11.18.45.30; Wed, 11 Aug 2021 18:45:30 -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=o11YJ5j+; 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 6C9D668A375; Thu, 12 Aug 2021 04:44:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C1D768A2D1 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lf9a6eK+7+WaMlU1IcndCkqXcSp41mOL34nO8bhgai424lEU7B/j656/LU/GVygwW1jlxzDqlizjzs65o/TvMW8cSpaXRg2tLsFGxttqtq5zAIVNzG1Y04D1/daSefQTEfMuzAgNNEr2yl3KEmXz/x3vlHF3dG1/BHKHP74s87yo/kwlBIShAlRDfheSP18uOPbwuuiS0qkZ1Ty7XryxMH5118ZUuDVrspLSnMATX/M9OHBalfWm2wd/3CXtn/FEyQjs3hqRTmNqpE4Jm58OBe4p4vPXMCldzrhWt8ztFNbVCN41KZ8qiT4ovuaYgiLwLX98h7M3rl75L1b0Rfgg8w== 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=xtdRjUsQk//LclUZmY0Nz5kVZpDCbw33w/kKC8Slc5w=; b=fxUMCucezIKDX/y21Ejb5MqJzKVPqACn8G/Isd+Ux6JuQJNNbnYyaEhi29PoGKLiqdNajU6SP+hgAeamXbGLNtxKcQfSHkeTbXboLMH1o1w/zsgPRBY1zuY8JJQOfuqwf5CrdCsKehmqLdGNj0C7kWWjC19GcS6ysXXq+KBIw8BC92f+gIW9UmYT01M04JWaa0AYDaNuXuAzvjX75pUQsX14fNgHNQ9QMKA43eQYua9u79MND88zOhaI8Nfxka1AN7XvcqQUIX2jVH9rbSiPf94fFAyezETsWf5y2Pvz2CvSQhpBLIP4HDMpQZxIjeAF0CGHwyVYO9QZOb501ortyg== 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=xtdRjUsQk//LclUZmY0Nz5kVZpDCbw33w/kKC8Slc5w=; b=o11YJ5j+yS5T1P93Jct39d9WmtUuSEgZytkGeBLGp68B3mxQJhcKSffdWBBVeCsuZyb4u7LhiOohwZf3egbQXmWfYrG/UL08rosLt3n3dH/aX7cZJeqUROT3h7sQl4xv1+goZycq7fecSAbaWSU3MCF1IutF+YV06Uq5CGCDctey7WPztSt6AXZh4UyudOY2OesAFUdycx8qu1ClienSVwE4Bwxpb6I+JVrFi/fN2pBuM0gImtD6Z2LMZKsrmAb0/qdvBz4bk/eftp1VC0kMn+oPy5LmuNkaWppg0RmPxduV5n0ZTgVg+NXjo1yW6BC4nfl6gpGXa7FtW2cp1w/47A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:36 +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:44:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [mf0HTk92fS72Q/juQ76+tcTPrUbnaNWw] 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-8-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:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9be3797e-67dc-4db1-5464-08d95d32b900 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR/bi8svvK5ODZLDz+aR7eyMIDiCTDUbZ1fA4VkqNdCIUFE+x1t24V7+0JEBhdbrq2+NLFC2TJPKSMqgWeCHQka77/F+qDKZx2RU3r/oHMx1JMLImHO5ugekRgK+NlIspwMCzfY3NaTIDDltd0lSlM+D9k0plBXaSTgYeM8yO10Og1C2NcZjpzlJ75wUa14GImFH2JXPzm1bRQqYLPySzCq8+rpV8aqkltRBLGTAr0HgxbHeVbMKazF8VTJNRJJQCemtj3qTnfWf29CnS8trJWeAnCvqY12Qh48CWzR6EHBAkAOT7QteicUlGL18MzYcJCCjZqJcZivfRFCiyWW8CGj17LCTjuGr+2fdBcIl93VE1ail3r89Z1dxoXs6EatHTIRyDNFfkVHcrEN8bgjCuYA9Ai2VG8wt+wxA9oW0gwHhvVVSMUpGXRl1vWjpKpGZLGAE8rxsGO79nmmXJ/axC0Z9iwV17dRZ1W2t7tZCqPkkNQCUAX0ZP/2jdPv4v97fCqW5CYd0Ej3s27R1V4H+J/+eBdTbvYbWYaKVj78+npYslMy6MQay/FF4Px/yuTGYmgFPSxmuZ2ortoIzDqA1RXdT1oSG6v9U/Csizjf0FGgOfleWdlwtBd7l2Sc6ys2QJt276yX87bBU1ajSd8ce5omZgexki0i/wu9iYrgfzZNhFd3wB5EyoMxkknjfx+zpoXOolpBrC5GIOUJHC9kEwnjNL1nky6F4Rd3FzOYXJnEyA= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: obBDqP4NPpi9WDNpX6cQbbx3cH+g1N7pcgtChNuuyaSBQJ9d2OKVm/s6Rk8xUlYSVOfR6GzdLmm/j1nmaFbM53YFElMUsbf6gkL4fQxUUGiNRS6B7LYsWGVT6pIVb89mFt4C4btT8bvCgaqrRcrAOOSJXwYRpAM3FxILZhgBLqara8Wt6ELdsjW9bJuYuRb6vmxkZ2fPrSEzsDZFvIsJORR1QCoE56iHjwPO3apfs5GsIQlT0htZud8XUx2rsUgLpjG56Ldm7nm0+z0ESZva4lMvVjzWUkYfBmlqBNsj10zTpIoWVxNUrcxQnVwo8J7rL8vO7FN6hniPAxNGRBEWlUCqCwp6xZc0uTQ5lpkeI5n63m4nEFl3RV8zvr9pMK9DRhF9lmQHFwyPQmYUfRKani/3hqNPJ0MF2TR+saJngo/Yz51YwzqIvKLGZKRut7UE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DD5U8CD6ncpDv9nGRd/ozk8TcGEqSptRDeMA9gnEL9P0cuok5j1rroYV57qJw16FoalP5zoTEreOy+thMpkKxU+x1jlY4H0pIO2y1RNNf5RvMU2IDacLyRwlhA8/WxDxiL0ioiEgz4dBFTVEzlMWDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be3797e-67dc-4db1-5464-08d95d32b900 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:28.5002 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 09/23] avfilter/af_lv2: 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: HWe3x0oiS6P9 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_lv2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index 28b729691d..d97367ca99 100644 --- a/libavfilter/af_lv2.c +++ b/libavfilter/af_lv2.c @@ -393,7 +393,7 @@ static av_cold int init(AVFilterContext *ctx) const LilvPlugin *plugin; AVFilterPad pad = { NULL }; LilvNode *uri; - int i; + int i, ret; s->world = lilv_world_new(); if (!s->world) @@ -464,10 +464,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.filter_frame = filter_frame; - if (ff_insert_inpad(ctx, ctx->nb_inputs, &pad) < 0) { - av_freep(&pad.name); - return AVERROR(ENOMEM); - } + if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) + return ret; } return 0; @@ -572,9 +570,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->maxes); av_freep(&s->controls); av_freep(&s->seq_out); - - if (ctx->nb_inputs) - av_freep(&ctx->input_pads[0].name); } static const AVFilterPad lv2_outputs[] = { @@ -598,4 +593,5 @@ const AVFilter ff_af_lv2 = { .inputs = 0, .outputs = lv2_outputs, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307884iod; Wed, 11 Aug 2021 18:45:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwczeY2vD6+MVg11jX8PXe1uwn7u6JCfGdUlA40/XKCdeuLIX3iIXH3mwyV4d/jZwcyPeKz X-Received: by 2002:a17:906:90d9:: with SMTP id v25mr1304014ejw.221.1628732742981; Wed, 11 Aug 2021 18:45:42 -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 z14si1159307edr.282.2021.08.11.18.45.42; Wed, 11 Aug 2021 18:45:42 -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=Wl+zcLya; 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 47C8F68A4A3; Thu, 12 Aug 2021 04:44:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70B5E68A375 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GRBKbwjwmVf6Dey4nXQFyrXZniM1LUM555IvVhP9WK0DQK7q1k1nYlE5cDy2dyrL7ZMUNr7CVUamkvv29nCt109RbS8w8wboaO5MiRYcS3Q+dMttT/3QedtRi8VqVWnEni31aV+uLCkmF9xZZVyZ5fFmfV2x5wd4JESO/LrG+iYMACJULLNrl5Q/HEXjNJ0/O+5nW/aighHSu+nbOioem2Ke9OMUu8vk3pY/Bmyc3QRSAtHR4WcNsfQrdnqAc1wFGOXJGV+jRP99crxHgnl7l2KvBnNK0TRbEyvCzARo/3rj0v6uuMstUkBzyBCZB8NTuw35Qesb6C67djZUhXaBtg== 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=WN3puR7pP12i6yw8iy6mWthVkbjk7M7wxm9hjNgg2bU=; b=oFrMcbkJsjvqX1H02HrFWIK1YzN74l+h0MnhVEhBA4VJTWAvYrOLdXciaWizO3tAB435rUMC5Awdp5XIQ9wIKQsGP6XeE9/Eqhfi3xKwom/YYZVUSoS4c2EI7rOktoHLQ3HU/BEgdsbXzP6xH+IAvCSP0zBJTFFF2qiBlN5RHQh0+Gio1eROUVZq6hK5Yr2xQwvHpX4TJIk1nwhSkMedLnZBGbLuW8rJpvJvR6z0AAZQtRi9vca0e72u/zZ1ZtSNoc3WGQs71JZGfb3HCsBWRJOs12EaEHGQZsCwHz2sePCASLQYyDE+glglzKweFWeVK3BYMNxHou7LFnxPgfNpJw== 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=WN3puR7pP12i6yw8iy6mWthVkbjk7M7wxm9hjNgg2bU=; b=Wl+zcLyaFmzEZB4b5CEuJ2I42RaR9L422GCCSq7bxuBHfQaf71hrsztEOy1o/d7TawtB6UKBgk/O79BlgLXtUvscVgvWdJMCiIxQEwPU1EibGVmNpcQbdaDZ41Ig9SpEts9aUxAdwuaWYEgCxIhhVfOeVMeKlppi3jG+HAE1vv5KLp7fOUnP5xvFdFejs4DhRsBtoHF7zb+nsOIaGOxja/QqEmOGT6cNcZUhjtJ3LVswVUv4EJz61gX2r3D/Uptvdpdm/6DPan5cVfwBuSLIalUlJWl7ZduJbtPkYFLcGVzHo48SnmkQ/n3YqkjN26IIzgm6hnnZXsEEP+mE8jmOWg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:37 +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:44:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VAmhQM37fxaWMqZugM6wOObSpG7scU60] 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-9-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:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ce3affd-c3f5-4a7f-ab31-08d95d32b946 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR/bi8svvK5ODZLDz+aR7eyHGs+mJLrNO0EyZ9byIxnzMWSvs8P8vL3bR0AX/hiwkox+GsxOv3vSexzEKSDa/A1oioOvDnnbdKNcc4pNrqL3vvlZLZPiKIZ5vgZt076iD2QIc2K20v9ZW4je8brAAyy6hYWyCHYgD+d0t0xx7amHM+3SBwwjzqMKw1iywwvWvutpGwTbARd61IEEzHhZG8lD9DfbTC/X0Bb+lFAkan5kpfDX1W+B8PdbTPxJBW/R1gBxrlNXRNf4JqagnriFFJ5kBp6/0NF11O7hvtiJb42GUv0ZXVBCd44gRuprRZxPEQ4QTe2VioifOLzwzlBx8wbS9O6huJHvRxiRA5kSoVrXZ7gybpyV3CqLyQJBSYanBKqinzv9Ay3xUDFUR5wS3UnftX8LeauTdEzEyWbtts4rZAe4LdhWVO27u2VcVTHtV5HyGoQx3eil1SoStIajM0tW2loPuzUwm1VmNNkOjxG+i+uw4rBPo1I+1reUirtvOmV6UeGpkFxxGzZkmdugWKPYeSNymEWdHVnDmIkA7eb5O9DGFJyGh8wWxUtNd+cIeerzav8+FhlsVV2v4GAIlBRmuNBNB1ei5GVqzIp3fQl7+1VDCC7o9j/XJs24E/YohFLA9wHsoy9oSfkfsXV1huYe0rdCxIDLCJVSjqeDKB/ANofj+D8jk/EMqQogYlny2EvYLX9dDMyxl9W9Dj9aHMV63Is6E0/AwyjMPMihfg+98= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h8QqVOO7xV5AhvrQ6U6OLqEnFPsooEjBPQgEDoyiw3T+T1xokeArbyddzUXmxycqyLfN++NHv6RzDvwYQJp2PUrZA8zwpsBrqHToY/CcqYQkX4dGaJd22nXMA7jUE9XsvdSzw5FJ0b0omijFMxYr11ypzIL3oDrRZzNFr/NE7R6L/QFlvUZhFpAt2mbxCErKJePmuSNX8UaQJnpaacNpUJrE9mtoW0K/iAlSfvkF1WaNfvmMVKmegyayd+q5JLrjMX5tOfq1BljYAw9RwxeEhUClBsRsnBWS8KHqkdEcNK/cbW6OaWvlmLhH/btDNuT/bmKHWItqeS/Xc9bocU5gg0+jovJrJLPbGHVUQrZZ35LNTY6AGrxD04HMkbqzPhHlEAwVTGeYEGaruzhob7W1i9yCKEz+ove2EA76CZbqLcoy/lHhzm36fwH0EW5zAMhn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PAkM2H4Hm5+Z5gTuUars/ce1FSEEYQhiXpr3KzbvdBgTn6K+ycddj2oahXuEWXK9joQBNhFPMDukqFmL8yYHPt2HS5lie3TQ65xnGYjAxqmK17MDMaXCTYKwvFZia/4NhWr43y+S4oqpkXpY4YpPNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ce3affd-c3f5-4a7f-ab31-08d95d32b946 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:28.9542 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 10/23] avfilter/avf_concat: Free pads' 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: 5Vbvoo+AjQIZ Signed-off-by: Andreas Rheinhardt --- libavfilter/avf_concat.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 333a0b090c..0ff7cb20b0 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -317,10 +317,8 @@ static av_cold int init(AVFilterContext *ctx) .get_audio_buffer = get_audio_buffer, }; pad.name = av_asprintf("in%d:%c%d", seg, "va"[type], str); - if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) return ret; - } } } } @@ -332,10 +330,8 @@ static av_cold int init(AVFilterContext *ctx) .config_props = config_output, }; pad.name = av_asprintf("out:%c%d", "va"[type], str); - if ((ret = ff_insert_outpad(ctx, ctx->nb_outputs, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, ctx->nb_outputs, &pad)) < 0) return ret; - } } } @@ -349,12 +345,7 @@ static av_cold int init(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { ConcatContext *cat = ctx->priv; - unsigned i; - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); av_freep(&cat->in); } @@ -463,5 +454,6 @@ const AVFilter ff_avf_concat = { .outputs = NULL, .priv_class = &concat_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS | FF_FILTER_FLAG_FREE_OUTPADS, .process_command = process_command, }; From patchwork Thu Aug 12 01:43:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307990iod; Wed, 11 Aug 2021 18:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwLwzb4uVpFqbkz5ePQ6pCWpETduCAfEZh544qxS/RN1YCSEhRTZOw+TphZ0k6vrMgdMmw X-Received: by 2002:a17:906:c08e:: with SMTP id f14mr1337514ejz.380.1628732753688; Wed, 11 Aug 2021 18:45:53 -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 4si744341ejm.546.2021.08.11.18.45.53; Wed, 11 Aug 2021 18:45:53 -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=nr0NhStU; 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 2837D68A4D1; Thu, 12 Aug 2021 04:44:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8588C68A2D1 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mKJs1+A7J9p8AN6TYiMMwoEKIaYuAbhWYuj5cr8/pgoWCIKrb9cNHkyUAk5ByEGfuNW6ajNqzb9FiDNwlw3IXYZJXcdog/tfzll43eYn7GoAIZvPvMkNmNzs3tKWayr+PzmT3jfIs9eOj3k4933sWAIySQ+4SAD4EcvpbCt5L6C7maaQUuVN9bkDvYfEPi4s2rMo34P5m2CeqIBcw1upGleefxTXKyu2SKEfOIY+Pp/mknzoxbZpJ3zYCeZje0LwkoZkaXo/Wy0gwwwwwNfVdoUcYic5K4eri5E3urKf8q0y9jTZ6EIeTLOTYT5M7IdxS1bDH5PDBRGxCT5ewoFkEQ== 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=CdAzVn9QOT4dzdUnYKAlYoSau8wYbjkfIpIkumkWXLg=; b=TQw89X17D8B+gbfJJvhjTrvJdtmI+RzK+aiLGDYHl1UX9eV/pRqrCiuYtG/O+310DizDt+JTa/tsaz3U2Pfjsy3Uu/sMw0iERnTCyCf2Y//koup1An6RrYVoKLikp78Pbleu3ogk1V4gIPEZuV9umn0t5+LS5uA/b3wwp3iPi9pBS+hOn0thw/2B3sapRm0zLgWyR5gUll8NGZXZtu2vDW9QVPw2NgNchunfRFDZVGUP6mZOymmiDvJGjf43a4EBHvPFm5RSUfPjuc1qkZzGxBBJ0qXUJVFZRYmog85n6979ZFWvIGuBZjN+6B6wus1ZGAbDuZnVNFepPSZz4l86lQ== 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=CdAzVn9QOT4dzdUnYKAlYoSau8wYbjkfIpIkumkWXLg=; b=nr0NhStUImXbaqJrcvgwdhV8aEnYqPXM1mGrrqHRRoxsWlFEhlZtTdUmdBWzhzmRlRT7nDSW2QccI2cOEBwvDn+zh++VCaylsGiPYmXLp7Ii4XhKoAKb4fmHF3MEBP9mINTK2gSzAbjCDvwKAD14AK2IEunq/CM9lRQoVOFQtXoqBx2GPOFToqJej0Bky7ZHHoNMfqLx3AEN5jPWCcqdnEWkKyquEETlKT4zaU9xbDznWveht3FPS8p6ClVa6fWmnMHIGEIUCrEvAfO4CTStlP5VAOFWr4rd4OO+fGEYQTi0GE75V+kWKjGU3b/MJGgtrfhXsx3GuTFq0w8BZkL08w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:37 +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:44:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HkMDk07TVDCzP8KgyXIEnbe1fbxtEpP3] 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-10-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42f077ad-139b-48e6-62fe-08d95d32b987 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/qPNlcDHlvkQylxIo3asUOIfsrDy8lQcabjAwU50u1Np/xMY54M8OBRZoMiCjJAyHLswhF1h9sPfiqKyuvmAiQlMmwbOXyPEv1tWvCNoGcY3hFfFetV3Q8X2v7nY4YuoyVM2d2vFGDuz8ySV0iqFg92HcxUtt3WZRJezrnJuGlUittA88/QkeTRkjB8sf0Aj18LVlL439h8nGLSr95G+qVF2n+05pVXPFadccuLjfBOCHAkDZmXKP9n45b3/Kj8Jg7Obnvnncbhdf3UcGo2+NwXTurajvsrOqcXxhe+/o3ct3BRLKNkFhFFI5A3qo7Qqu5PrNcaHnBBUIjHQrSLQYInTyBY92o+icpPORQ8+fVCY98d97UgC4KS8PHdo+LhKWACox1vlguBrpUsGkOMJh6KTcVDbdG8bRShow09fjRm0JsM5S6pP0PzpGErLhu//IgLswJrj+SL73klNbtn20QUALrW4B8RZ9D9AuWpRqFcvm8jFfL51donh6gDPy/7yQ0OtuhiXVpwg1Fp06ajmcqUgl/GOiBG90DLUB5yt64Vd31XQfS4K5MrF/PeUrfNICtPD/eTh4HUqrCnrkC4jr4G+occbr1P1Y3WzjlGQb2PVoNQlkiytkCwCMpVji/wQbt8iQgWiRkfgXvPo1VUJ4SCTW41uGEEImQIBay02Z1DGR+2fMGsgVWXXzNeGiiktVHMNuXoJJquNwT0KQSg2Vno= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AE11bZBcGY0NdvIJtpQ7eC96IhN1qBNe/Y6+ExSbtYk9NjUiSBMSBUrQfn4US9PMIPBGS6DiZHJfDLj/r44RDMjTXJP2axS6BfzFRBFg+ZHqwSZoqbRi4dkED86qz2gWXsbyJ5is/XseoSAR9SZPX8//HGVk0ODTBs09xy28Y8+RCtC5yuD5oYNvVXBDh0ayLoTlAcSm3ZDSFomCEALkiHvvQrQS3dNKoXe7xDEMiXQfIg7nZR28hjEhb6oJ15PnvVVIMy8aEFhEabHhXjZlhG4SMRymDfosL6cAUHs59lL4SkDvRJYfft7MweSUSDt7R8aImQrlFq7lLRfjrzTLHlV2jHBxSU/igJ1Fn7wfbhHl++cPxGImYCAooFKEKSGLAfZ/SQO3jXUBEy2oYA7C4jnxCjOL2ZDL20k6HqhkKMaDjlaqo5Evw8apZcSrcSb6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xYXPAO9yFfYnaF1Nj1H9JryaYzF/OFKoZZzewCxpuAElkKc0IQYxn6K6ZtdjjzJ63UdqrZZu9HkJ45ObOdZI64x8wVIH60f+5tJk3LbdksVsL3mA8f3qT1GH+NUmuicsrfiWGdtkTSeh9EDVSNESUw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42f077ad-139b-48e6-62fe-08d95d32b987 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:29.3943 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 11/23] avfilter/f_interleave: 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: b91QkxtflDbj Signed-off-by: Andreas Rheinhardt --- libavfilter/f_interleave.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index 259952b591..b2c0305797 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -173,21 +173,13 @@ static av_cold int init(AVFilterContext *ctx) default: av_assert0(0); } - if ((ret = ff_insert_inpad(ctx, i, &inpad)) < 0) { - av_freep(&inpad.name); + if ((ret = ff_insert_inpad(ctx, i, &inpad)) < 0) return ret; - } } return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -243,11 +235,11 @@ const AVFilter ff_vf_interleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave video inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, .outputs = interleave_outputs, .priv_class = &interleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif @@ -271,11 +263,11 @@ const AVFilter ff_af_ainterleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave audio inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, .outputs = ainterleave_outputs, .priv_class = &ainterleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif From patchwork Thu Aug 12 01:43:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29449 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308546iod; Wed, 11 Aug 2021 18:46:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLH953qdpk3L0/uP8FkNaJrpl0cv4xM5T8bO3WvhxbSxNWIMRyZtzopNp9ardhea8VmUj/ X-Received: by 2002:a17:906:fa92:: with SMTP id lt18mr1345355ejb.359.1628732799496; Wed, 11 Aug 2021 18:46:39 -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 bz23si907011ejc.155.2021.08.11.18.46.15; Wed, 11 Aug 2021 18:46:39 -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=eQqmh209; 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 12CA868052C; Thu, 12 Aug 2021 04:44:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0098.outbound.protection.outlook.com [40.92.77.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67FB468A3E8 for ; Thu, 12 Aug 2021 04:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WQZGkjnxNQpiyQDXoCMVFNkt94Js5rcOpLLQHBwAtDOSZdoOpW61Z7fTbDLUPM691xHvTwOzMewzP/lPLcv8EGGJONL9GYY6x+YaWgdq4D09R7EpNCrWnm7ZeOFEOOqsk5AZr8ZYWeQbkkNVX5JBFhWKqt1U4lF1oGzW+iTZdXU5IQTyHJM62R+Ki6ApXk5v4tyyqHtKKVzw9ZctCkYAZ9aUmiD6Hs4eoczrqfm6j2qhg2c/ornGKuFUurOU9zJJuLvZ72/O2VYZDdbkev1mn1g46OuDKUIU3tQS6FtazYhWyltWNpdS9LWj0RKh6hpHPererYE2AqanyG9lzJ0wUQ== 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=Ym0uE9LoynV0cMwdTU9RneKT0NIVPKnLxLITdz3+oMA=; b=C6rg740qEE9qWi+G0fm+8vWjWhpfXQHh9sZMHqI0x9jvE2+hncD5NIEbu82x6hovYcVBL0vdD9WWfmVBIu5mu39xncYsRfmn/dtp/ogas3/ymy0VXzGCiSnujvLEIl5axAiDgOUZ6X3zseqyjr9X8p3CflP9O2kZ/2PNWdFYeR8Y9OThU7dip2XFzxL2QYmq0imx5B5p9DeVEBa44bu1Sexk+M5cJy+EJVPZ/tbUpVRkbX0qguMCNh2SAz5fEQPSDqPyO8rjQLDf2FsqN9AGTtZq5EWYG6bwwfT4M30PkHVFyt89v3oRucZeIkia9Ech+dYXdoeL5SQSRbFkTFtnwg== 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=Ym0uE9LoynV0cMwdTU9RneKT0NIVPKnLxLITdz3+oMA=; b=eQqmh209siWSfxoFVN/zcOAgby4cJo3AhMm879vOcQVqnrtMeIZGgkER5zsXSRErhbLtLUgLiu48hwXDoZ1F3sn6pb3Vyv1B9E9h9mTK6e06vFvIR/fv/tvXc0HR0904m/KipexPajuWZo2nO9YuPC8PCJAMMPYSRQgry8yNhb0h5B8ie0r6Yp6n79+Rk/JSmTULiWO8A3WyyzzGxNu1vwVbGVVCUYmSdaKjCvYJDXfZdFc9gB1+lRSH5TGM5/o96iBpKdcQlruiSzN0pdgXe3bi3FWgvrrsJVczgIJsNLpZqSv/7/67iOBb1lmRV9XKltpSssiSUcyVEDD4GhERGg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:37 +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:44:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [G9e0XIlBKd/dl6h6V7cgTLMm75Llu0BS] 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-11-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8384922a-59eb-4540-c697-08d95d32b9c9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR10VeFmxskfnAS2/vTcdsxGla6JjGe78jXFunZkyeI8u6xYgAHQfIN+2hF8ZPzO77vWBnGEq/FiUMJ+Hm80qdJ2tdB8VEl4Mej0JZ97fZlBjoku+TdEC/8qo3amabDcevVudISwOTkTc4GmvG2jf6N2mnEOrCSl5eLaCkmd2ns2UdVPO/U23708UhiI/cdGkw1rDae/qXfAESCvZPKQto9Os0CZdk/C/dZP6kzte1ncFsfRIVGorUBX58lzYzYQRwKG6bzInrpOR9fE95n4Fm8MUPC3FpKCdWp6m3MzCV386HP6UQSChTBSajFfC47KbuGGZCiRjguPmYWR5yh6BSwC10nWyQjStl2KteLW8YKhErgmVk4G+EsuSmGpbO8HCdJMDYAHSeAcWJqrEf0n+5DgkbCM/8TGCi8hZUWngiqrxNvTS9cYPQByy8IVBk062gbLP0gnCeOPE6M+zC7qfJEnnjXHcacsxSFwlO4fIunUXulfI5ePM8jh7zNod/dgK+xBJWDm6wKsTnFqKS8MDdwa+9OG8OIuFFrwG08JjZvyEd64x2axHt86vXerEwALbbdrACmvVySUz+dHscRi/o0zLyKOd5XasRYJwJ9GJ66KPKQEKXjm6PsK1X7qU6k/pccMfw6wiomgM0CzPy23bTYf61Jeo+8nKYCF4nP5z5BvSHVNx2m98fH72/gjH610Jb7vuTqiHBHdcgvjo6/Rj33nMnxiO0oCpAhmmhy5ArAvA= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cRlR9t0cXMMvfiCKwP5p92jkn87Xxoa0LXQk9bla0IebIFiuD4HBTvWWO0CsYq1RaqJBlNqYAYMV03dCjwiG5I8S1IOFe8UVHPAKMrQRcrwCQDXOZa/TE/edEGDpRQu3ze5mJd9yB5LFesiDJMSPrkkVoWPAsme8uiHB1/4oMmkXfWBL2v/jPvu/Er01e6hsnL+AoXtidWKiopteHdDxhp/bYJu+xF2pEMoqAXC9suQiduEcZowsu6srEzwRxvVkH3PCCMFa4o74RPur7C8hT6KG2C1gm+gWVUZlVCWoaEmAyyIwVMFpHhcplslhIJA4Kl+QnFlhZH+nesHgK6w9VPpL7B3WIYhvKNrIxRV9DqGLxnNBBS3McwrGNC5g2GgG145BLSPEZxE+rMD++lTUZkukTGN9WHyR+RrlKW2m5JYZJ4wsL7Gg8aJH9wLjpLpg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wVEPfuYqdc7GAr7onBjIT2CgvBfejL7Y5IL4oVS2VzDFn/nQXddbCTwBmINov00zKvI9zhy9Y9M5rEpZqIJW/UFGAcjY3Zsdw05iBK7bDJ5h9ewLAkaO8pVMxtNt1uq4IRa5whsFqWyOohzdTlbUMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8384922a-59eb-4540-c697-08d95d32b9c9 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:29.8313 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 12/23] 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: 7ctfmJ4yGD3A Signed-off-by: Andreas Rheinhardt --- libavfilter/f_select.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index f0468078e8..0538ee347d 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_insert_outpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, i, &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); } @@ -485,6 +479,7 @@ const AVFilter ff_af_aselect = { .inputs = avfilter_af_aselect_inputs, .priv_class = &aselect_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; #endif /* CONFIG_ASELECT_FILTER */ @@ -550,5 +545,6 @@ const AVFilter ff_vf_select = { .priv_class = &select_class, .inputs = avfilter_vf_select_inputs, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; #endif /* CONFIG_SELECT_FILTER */ From patchwork Thu Aug 12 01:43:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308548iod; Wed, 11 Aug 2021 18:46:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWce58IDEcfnxxhSVtEqVWY7T+WMxRVnYv2RSMdbasVrvR3hW/3Tu+RJsoIWG8mZZccxXp X-Received: by 2002:a50:fc96:: with SMTP id f22mr2440473edq.367.1628732800223; Wed, 11 Aug 2021 18:46:40 -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 t13si1165691edc.254.2021.08.11.18.46.27; Wed, 11 Aug 2021 18:46:40 -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=qhfsleMp; 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 2A9C668A4FE; Thu, 12 Aug 2021 04:44:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0098.outbound.protection.outlook.com [40.92.77.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8017E68A408 for ; Thu, 12 Aug 2021 04:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5x35PZLikhcFHW/yEKxvh7+UcjKedKrKcLWNP8fhpzm80XpveuQ2tdyI9tWyBbZA4qn2r7JxHrCYQXtQnlZcrnUIwmv7umjuDX2qohxn2F3PJB2gSc49BSmlOlP8gbzA6kI4er87TnejIx+p59b/9xwUhn6Pt4W1+RsyNo3HKdWVU3o7kTCge5YrruGCFprtDCUY6VFFSDFUI89G6cn+LfvTPfVPDQosm8GT3UzdvVLAkjJZV3iiyOqoGAYayo5e7JsZDhPlrnYwrq17pweaLPUqNVyUg0RBF4akw6FLzA8AWuv43B/Uzah7k2kVIy3ZnStWfnv9Urg0QK+R1mKdg== 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=Kq8ltGigFSR5rdA+SD0VsYJx5dRg9aldiOCpYrG775o=; b=dWPegqnS4P9xszFisyWMIHPF+jKSL2db6KDrczRnHZxqpHSNFxVa0ykjAo2ixlFwe2gumc6ehmRai5IMan+k3cF/jlIKiVTfOWfD/hEBygaCrEtl79UztpPoFX2Od4UXcDO3aoXo5vQKWt1IxC1ibwT3iNNwvW4ekizXs6QB3pIJj1KyGYN2bUpWOpx/4js9OeNmgPNnwak69pzrZ4+r2UdZzbN/su6T0W/q2hDmQoCo9h9e6kfigsk7WMFO78XBLU1YnHVLUOnwf71lY9RSNY0nIwDwjdvX025gRkAhz1NDm/trynosEmA+eQ32eqUwti78rcOptnRtkHPOVyxcGQ== 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=Kq8ltGigFSR5rdA+SD0VsYJx5dRg9aldiOCpYrG775o=; b=qhfsleMpB9dXFuADcHUvQVc2i23TiUwSfyI3eAEvVlySLY2nQsLTmK9QisJv9DPphFkMMHlmJWCL8cln/wCAFUW1qD9knH8MyykSdvz+BU+NsWf2rb0ekurS1WnI4WlxHdPSLYGbk97BCEeyN2/N1Pqv9OY3TuVv8Onhs2KVQB3+FmS6Rgtp5PiNYqRjnQr/skR6xK2l2/6zo+mOTe4MTgrpR1XFJHrVMSl/xYygM2Wt/5V3IlQ3ilVotATv3PPAmbGYacGf8G692y6xnkKniydn35m+GAKYiEVEUqDv0S0BguzhSMD7n21tJ4VqXPi+gxMj3vIVo4K/4PICSlVPcQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:50 +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:44:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zJySegXEH7r5k1DtYYhPQ6M3hcXg+7ui] 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-12-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e659c00-ce64-4c72-c5b5-08d95d32ba0c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/qyf//AHGc/+0qmYKELNSp3SNzTsx4UBxvRO3Xc/ajrtuXYpeqjATMNZYZDJa3CDXQi6mAsDZ8FC8QFRk2R/R/xYkGxj+XVNlzVl8o3UoC0/qPuEPoeJJW8/4ePbw67snS3bgsvnMiJ3OuEqaBJ5j9Lt2kjiD2fc33u6YdYrfhEpLfDvBqfuj8qNpMKT7HRMg9+on2zlFZfi7jTADzw1HYCeHdW/fDSEM3MUTqAhuO/js6NeYwQNGKwAzv2dUb2A+c14AtCCP8gutyi+BxND/z9Rcy6Ys6GoM4xb0lrUmu1PQkqUAuNBw3IWad0oBqSTMiQtDr3B9PQb3Ot9BR5F4UfuJ1xo2hadDiIe4jVwukOBo3LlsOPGqs7t2rNidP1AfALGB5gt5Bq0JSIIlSt49/MhQ7IRCS7/jyhLQfXAqr7b6xUbxNPJpgvVO7XAdoeDm+M+PiiyXBlieNWyeDZqdpCQ46JetPviY5m5iUYklLDbTuXDijls9zNQSqwMC5UnueBWllP2+zfUtqAte3SqtAfiUtwVBBiO/Q6rxEn+DkRvENqkR0ErDzadLMxC+8ASAseqZX8dWlSb47VznGjKCuzFNtBLI5JVYBgLXLutuiaetbK9Dnc/qaNRgmhB5vq4glHlTnDJtRteD2YVh4a7I3H3ev8rjI8AuXyndO3cJEbfCwCPffp6BvzT88Qqwswmmn6Uxpco1Oef/wZioNZCCb0= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJpu4vw1VBX/w2QeHHxkdig4WvBaCWBTWkLzDJXNCkmlM6ic84rL5SqPPm2GSHqqAHOBeY0d5KcHSKjWb70CfPU0byWrNOZ2wizRnfimW9qsq19aMeaOvFbiTrvtbkbBjhXcgVxqDexM1/BVzoW0MG2DbDipwjRLamVAFiKRJYAmhkvryRD3EcKn2gGJGrHyxKD2hbpab9J69YVyoAfI51xa+eqUK2ZAE6i4f4TdYWNHzM+VFoRc6JRJydnI8gH7fzJIwrUxXbNqsVFettvknNCxRvcQBMj+7vpVfGEq+RcRbampLQE1JWDTF3xD53ycF13Gua/v047VEsMjOQ25SyV7vyRuqItJKGOZMsjcROPdjJtlrYjiTSNcOdYw3VNKH3Qst4aB1PsUAxEsk2p/1UQtyfLkIIJkNZ3I1WcI397R6W5NqaRf9iU7pKhE3dLw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WeV7QE9X2Gg+Bnt3eXwuuYPIxClv13J/+mHK2Nbuxyuz3aISxgIzcMAl1Aw9Ds1SU688oalFTyeGJU06YnYbC9mDApo9Vp0ZS7yKuTHKg63XREdy1rwOxcPv+oYKNNOFuniQNuoTlAD6B6PEOCA42A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e659c00-ce64-4c72-c5b5-08d95d32ba0c 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:30.2555 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 13/23] avfilter/f_streamselect: Free pads' 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: Dzm0oyP+oZsF Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 22eb76d4d7..7762cdb3d1 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -172,11 +172,8 @@ static int parse_definition(AVFilterContext *ctx, int nb_pads, int is_input, int pad.config_props = config_output; ret = ff_insert_outpad(ctx, i, &pad); } - - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } } return 0; @@ -295,12 +292,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->map); av_freep(&s->frames); ff_framesync_uninit(&s->fs); - - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - - for (int i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -338,6 +329,7 @@ const AVFilter ff_vf_streamselect = { .priv_size = sizeof(StreamSelectContext), .priv_class = &streamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS | FF_FILTER_FLAG_FREE_INPADS, }; #define astreamselect_options streamselect_options @@ -354,4 +346,5 @@ const AVFilter ff_af_astreamselect = { .priv_size = sizeof(StreamSelectContext), .priv_class = &astreamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS | FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308560iod; Wed, 11 Aug 2021 18:46:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQvZSoF5kgP+ZfyfI8Tbhj5PeY2QXccGXweVwFKrk7EYmdQWboNTnCSe3JzNXG7CrrhnWE X-Received: by 2002:a17:906:1f8b:: with SMTP id t11mr1324559ejr.131.1628732802118; Wed, 11 Aug 2021 18:46:42 -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 de19si933824ejc.623.2021.08.11.18.46.39; Wed, 11 Aug 2021 18:46:42 -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=JrNaAV3i; 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 A7FDA68A576; Thu, 12 Aug 2021 04:44:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0098.outbound.protection.outlook.com [40.92.77.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94DE568A3E8 for ; Thu, 12 Aug 2021 04:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GuxybhMJy2o/2OyvppX6XGNnTd4mugwLXyCI5zxLl5Ld5fwEUnPYVJR+/1Gaq5uw3ADdoCwc/Tfj48eZ4xF70gah6SBPbk9XAGkxdLaJMgx86QuvxTtGDkO/RPNkDiG2uXQQjgaJ+PfVIbYz/wK6eHwgesSFHEcwxrBRb7/krG8SjXOtaZSIFf24UTjSgiTbBgI59aA7I68oqW3ymVKzBpQgWNZGg5dB2W5Ks0OwKdkv1YqW8wxBPR/eForH1I0wOx4ti2K+u/HcrHhMzIrM4F9ekoE7juuJcHPzWFq960vPV7maru2n7hyzq5zHveRQrK7pgnmkXgHH8JEWl00JWg== 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=bfSKls9w0FKCKo5u7qOpYjOlklbCCobBjurwqIUWdQE=; b=QL5JeUq/tU6AydYSpc5ZsHCcMrIWxAYE1BzofDd4UCLjGdlcP8mLtoVXlT+k/2NHsEUT/F9VipaTy103UUVfK0yhstcUJkSNMeNQScVmks3YgAratTptiLqggumUegiKzXxuGW1se/JA+x2SjpNFS4mT4WDBqTUZIg3vxkkqrJ4gI0INKEqknMh6tRf9/pYAbtxgEIdGH3wb/hPPIi3F6FG/aG+lMgoAPF0dIlvHlqZsAWtUxQeeE+UPNwxFNLwiopMTI/ufOSg3e0WjPRpiC+NbHVUMZyhCKTjUhTlguRGjZxLIkt1HXZB+0UN8jLw1n/LfnojoUupyd9f5vcAZeg== 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=bfSKls9w0FKCKo5u7qOpYjOlklbCCobBjurwqIUWdQE=; b=JrNaAV3io8bqwWJvzeboSTT7stfkaqC1rUS1Ed/t4hR7r1Fje2EFqYVdXd5CuixgHvyn/AutnmsgUf70b5wNlmweYcibUXsfDVPImLZOYyHRvLXhhJ5TMQGQPDe7DhTlxBLk/G7i5diKkIuNJcmXkyBpKUj0e5nWIwqSooJQuF3heBo/lrCyC9lRIZ0Gcf8PR+ACtQ9aTLhrFeUohnvlqUECV31iDoCkPY1zHZmsUoEWYBDHKrhYu3i6GSf3j+6i4L1YbbzZvzcmi0k3BbSuk7OYnV4hSN/cxuq4CJ+VBN0YbneOg+3xjvqHWq/+eA5+1zQx8kUl29XlaY8eTmZ1Ug== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:50 +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:44:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hcptWrsXKJzi0jvCj5/rbeUcDQWUzRCV] 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-13-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:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18211906-0d9c-4a05-56aa-08d95d32ba4d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRkQffRz7P15tuzmHqa82LIXJ4WWdVIaeK8+MawdEP1SzPM+QVW5kkMujtGDwRJeNDzBLQPTrqd5w2Fer8ckQlo1rj7cSQqfsPdeYbAGGOGb3UoRQzEV3M0qUCTocuwn4bchimpxI9G/AiocGM7CMMJkigOadMRfn2ehGiWC3jvnNFejtAPELLhXhNVtj9k3tIFXa9AMDsWGE8KmQD0GM+M81LiOZ0CeajwCtLiXXMnNoflk0Rm53deuWCdyvil0YWXdymosr6LyRMzow41zarifPqsapRLLnlHA3oNjwslPlsdJiPjK04ox/gg2HyHyt5sxvtJXZJqEzlHcZ6qB9vv8fZKLatnbj67gNcLZliSQquFLoM1us/lcv/YJQw8ZDytbU0aRrf2Sx4/eXh9SmcYmVWyjZTjz8zpZ6FAcekoxMhu3tqTeGH9wewhyAffz7SeZ2h3p3VaMefw7j3UHrud4IF0WpxTUqXRq1fg8vmu9gqhMjBThUZ/z/KEKLtZa8WOJgWbs8gTfG41VCQQh7wWappIX33wgw6b74fbDg8z0W0nvAM5JhLjDxGquQIaVfu71k7BTGjz3VmiW+B0DawF2f2bp0M9Q8qYRDFVPQl5fqQyOW6P+FP8+TAft7zmH9uOx58nk0JcAylyiLqa7qPx3HYMUf/fTBplZ1l0oSWM43EEkbYh/2D9euOwyWFt3ooaamjq7/hZ6LqSaKq9UKWvoRF+AWnYJbnIRcWKkU2vMI= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lXhbP/gYCWGGHH3I0ygAPgQu5T0sPDJHu8/WFGfUFmEqjM4tsgsocBaZsKjbpUJZ7bIIpzbm5zV4abDp+pUShYNukG/WicblluYjGdLWxtCdYesR+YtuLVspA6MNdhsuWAAonGfwPR2JLMDosoDv9V+QuwMeldGQEG3Fa0zzZWVHADF7v77JOj4MBYEQxJjGHssNXILwEKDivmXO5RdL5SyyBONyml5YTF1+wJ4uwfGJblyA5tQp7Q8hp5uV999pYHliRc8z4XiMwnazy1rx87733vLD7Fe8GTFE/4DUsX036XmeGey4Vd/mhytZtil5kkcW15+r5R37oDSPuBh9azKEGvnYSs0pVgcrelXzhrblpcUoXbHoPAESEx/LDsiDz/P+LxFnUswiSY1Xq7A2EvGM4H5v3sh6kplbPfH1NlQzr3VX6WhnF4pHoh2UDqBV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 25FpQzE1gXJpjfilSbHuPOlamwNKAEi7i8+nk2kIwwsy5ISBZ0ak7Bfq0ncehZDkA9hWdm9KtT5RHYufhMGknCZufM2usutPbg9uzpakRxRVAWIAuR2FuePkhj6RMyBiSp12tHyCNnidfjPLtXB23Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18211906-0d9c-4a05-56aa-08d95d32ba4d 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:30.6816 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 14/23] avfilter/split: 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: 7paq0eVOL0BY Signed-off-by: Andreas Rheinhardt --- libavfilter/split.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavfilter/split.c b/libavfilter/split.c index da5f681af8..b14f6798e9 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -56,23 +56,13 @@ static av_cold int split_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) return ret; - } } return 0; } -static av_cold void split_uninit(AVFilterContext *ctx) -{ - int i; - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -125,10 +115,10 @@ const AVFilter ff_vf_split = { .priv_size = sizeof(SplitContext), .priv_class = &split_class, .init = split_init, - .uninit = split_uninit, .inputs = avfilter_vf_split_inputs, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; static const AVFilterPad avfilter_af_asplit_inputs[] = { @@ -146,8 +136,8 @@ const AVFilter ff_af_asplit = { .priv_size = sizeof(SplitContext), .priv_class = &asplit_class, .init = split_init, - .uninit = split_uninit, .inputs = avfilter_af_asplit_inputs, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; From patchwork Thu Aug 12 01:43:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308668iod; Wed, 11 Aug 2021 18:46:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2N/FczKWDLY8d73Ulv5fQDkfqBo1wVB5M5m7J1i3UTOJBwvhNSRdhkmRJ4/E9PC4GJoMt X-Received: by 2002:a17:906:9542:: with SMTP id g2mr1317104ejy.375.1628732811522; Wed, 11 Aug 2021 18:46:51 -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 r5si909504ejj.635.2021.08.11.18.46.51; Wed, 11 Aug 2021 18:46:51 -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="NEJt4fr/"; 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 81C6C68A58C; Thu, 12 Aug 2021 04:44:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0098.outbound.protection.outlook.com [40.92.77.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A960768A46C for ; Thu, 12 Aug 2021 04:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RTNmy4drm0M6+U2mcD8ettsuPpP/I+cykmnsguefLPfzX+6k8KNzaUScwqB3Iv1vuTB4RwBIgCyMD6SEReSRAXq/adXOB7998fmXaH/wXRghc6cmb9ioWXJcjAuPZ2D+9xxYZNP9if6j3CMGrbrYrNywVGqlfmy4vHfuGHknbuvJqNMblD+/sk3zEo7IuMNJYihKTYp/O0XSVx4tVY6hz1c/Q+wMQm/uYDOs0PBJeUNY04anPGI+4gfWCgoviLfsaqwOJEk0ll3xVSNsXBFypJqAuR/VKqx+QUrNcjaw2dJxhVJxD/H4lotqszeLDZiACQzCojqsJvC78H70tFQFgg== 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=lvlV5CNX9+5mruZuQ+HFOyKRw5bX5ZzD94STagsnVQQ=; b=G+hbU4J5n7JTtyGodNN5VatIbGsNdVVWqXf+nyHiVXtLWm1V3lCdMUJ3x6ntmaVTwL69G7TUdFuhgF3gmCngcUDGmzysM76aKJL358GkcTfq1V/9lsF4PrH2/dITWwYsPCoBA5iL3yxns+5ZDnH7wKYcCpcTr/9LpxIMWRlMvXZ3JV3ySbMXxQdQ6PeUasleOENVF0QCwRi8ejaFId5imhNjATm5qz/CBdHdD3vPdXldVlQmwKIKsE9toYFv4Llkic5vEC8ValuapOwc5RP+QuRngITRyulqRPKDCW+8O2BkvCClg5UEmpG6x6uGdrAh5EvLa2W+SwQE9r9N1C1p/Q== 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=lvlV5CNX9+5mruZuQ+HFOyKRw5bX5ZzD94STagsnVQQ=; b=NEJt4fr/wGZ3uJxNKS3mckiDuDTCIqhqlT3Ygy20ak4eRTRBZMusTlmWX0SFjqgF/bMTtBKMUSynpDZrlahHpRtrjtr5uUlnCtJA5U6Z0vpy7PtO/6X82Wi9WUlW59azexsLaGo0yvQ64t1ZUQ0Q+pUWPdx2plK4Jjy5LCfIYIw+uxCOzNG6KeDPWp+J43J6AHInv3TKVIph20QTbC6hlR4PLxeCw2NPgvQHtMWDLVswgdia+C/qDzw6AkjNLSXgmU2DYQ/c2NHm91o1xftymcgxnBvqe+VNareHdeViqf8rNDCJMUMYUIwEBgot8wFEX3fCdcWRkr7KBQXTa4ZH5g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:51 +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:44:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QKZJHq9IAClVwiWj3ncTdzig5brNRylx] 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-14-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:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7322afc3-41be-4e82-ba43-08d95d32ba8f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/oh8ElB4cbhUzAT/ancckR22Abpi6P7NTeoGY3bf/grk7irX70ijcVfWIvbEP9JD7b+vZp2BLf5pM83rgitEqtfWpc99wM3bYTPl3QU1THh1aqoAWguv7KzvYOJT13BUitcnrop5Es4rktFufkngaTRaZwFs0OhA795Ry4tlkf+qvJ3uIIyEATZgQS8cGfCMx3NhnOiI6nSeSqGhEVTmZP3dhLCCpzeNe2hJhXuNpZGKBcZpBMAoFtPakrPwV9bDBRVk2WKWaKDVWimSHwtQaw7aDWxcQKlJ6hT4UYsSrIm6tfDZ/2GPH0J6e3A9QCri9ew7zLHRPCU+LmOu91hZRVdNQlsRY9acgnwnOmKz3LhtJmmjOLxyhHVyNdOUar2b8EWS5xTQK9FCA7v8ccu4M8343NLMpqnfHFdJtjB3iH9I3UhwdDmyi+C05VZhOmsXmJhJEXgacJaewp4PGiKuUJqfZYEEwBzte9n61iHMTj08AjrFzwKGdT0xM4HQAtf17Dhkc+Ii1deT/KMQciSqCqzfHpyZ0PeECFDG1X+nMBrfv0iyfVscCpJ4Bs6y3qHvtGuilXCaXH/wUn2B+q1rJoc0wkYpdlR1EthcCl4yBLf0mxKou3dYbgiAVi4vacVb7h88TGR/TBOZWZWgRM4KbHQmABSX4RhjO9kj/m57PJB2yeoQYg2PqmTujBZPO3qHL+UNMNVDQnElroIDcDSgzlI= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T7w1ix5segyo2N/e1iF2Pco35LViJDn538peshhdLOMMc+HnkSQz17ByJ/1sSG94vwOLdLHwy7mOn5todtKGKQKTa3Ic/qiEjW1q/A4+N4LoT06Xk1fesSghfgzlTXRSmWxF95k9CoeeamyfUFJBC20HkSVJPc2P9W2XEC2b3Gs0vfImYZRggX6+Dk9ZDzSY0P+FR/KMfGaeytBsgwOZO4YVU1o9D6PE8iCZFEbMKrRmX5haipIi+8R0XUpb8B5MM9+MFylOBhLVhzbjxwiDI6G6p3+L0FdRP3w7GmRTKxCv/AfegYgu8xgxCyON3Q2D7U1zLOSL9pokturiX5t8fwAhYZ9+QNI2fCzWCSwm/PASEiA5INT3mhFYuOYQc1yhmW/7EHPfBDTzqHQ5xJ/uAZyBIhmqONaKvksV+0rmYoDKA4gRXFOij9nXrtJrSirl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZQuSqk6EtK8UdlCYtTjQ67aEHA5SOK8Um/QbaMgeWeVn0USTFFbUbUeZ0Ra01dhQjzeJD2ZXtTanot2C29uy53R1jhHAc+NLo5gF30/2MHS4zSTfXt0tVDrUL5ZLb4wBIXIVvA/WbJsBVDHqqbylIA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7322afc3-41be-4e82-ba43-08d95d32ba8f 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:31.1187 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 15/23] avfilter/src_movie: 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: 8QFUUMHGOWcB Signed-off-by: Andreas Rheinhardt --- libavfilter/src_movie.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 7d97295dd0..947aa8c90f 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -306,10 +306,8 @@ static av_cold int movie_common_init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.config_props = movie_config_output_props; pad.request_frame = movie_request_frame; - if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, i, &pad)) < 0) return ret; - } if ( movie->st[i].st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && !movie->st[i].st->codecpar->channel_layout) { ret = guess_channel_layout(&movie->st[i], i, ctx); @@ -334,7 +332,6 @@ static av_cold void movie_uninit(AVFilterContext *ctx) int i; for (i = 0; i < ctx->nb_outputs; i++) { - av_freep(&ctx->output_pads[i].name); if (movie->st[i].st) avcodec_free_context(&movie->st[i].codec_ctx); } @@ -649,6 +646,7 @@ const AVFilter ff_avsrc_movie = { .inputs = NULL, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, .process_command = process_command }; @@ -671,6 +669,7 @@ const AVFilter ff_avsrc_amovie = { .outputs = NULL, .priv_class = &amovie_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, .process_command = process_command, }; From patchwork Thu Aug 12 01:43:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29455 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308821iod; Wed, 11 Aug 2021 18:47:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxHzx7pB0Mkp5xISBBhy6SvdStMXpkQucbuNmUt0ANKCuvdtpeijxX+cGubx5BtzOjAeIf X-Received: by 2002:a17:907:2674:: with SMTP id ci20mr1410965ejc.84.1628732823120; Wed, 11 Aug 2021 18:47:03 -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 f12si1231450edl.0.2021.08.11.18.47.02; Wed, 11 Aug 2021 18:47:03 -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=gLjkii2T; 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 5331C68A591; Thu, 12 Aug 2021 04:44:56 +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-db8eur05olkn2034.outbound.protection.outlook.com [40.92.89.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42D5268A477 for ; Thu, 12 Aug 2021 04:44:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bdLOmsLotg57zuNaws2KftpBOuySiJYUeSyFUhLVnAKZUyBQ/LBR3dVR+2bUxRXFYiimCLEWnc4SDmP3EZIORgJrvkK/ST43/l7px6qvBFwIaU2oAHOTtWY/PD6B9zj0fUklKnFOJGWcdnUYWqGc4g93MYNPp7Z2cgv8fFvUAqcFwiOl1YqbCN1FeseLXKtTEOiVBlDSP3QKAvR6jDQmNbk1jtUetCN08EitZTsmGa/qwlZEn+uYnMUVOxYCrojJ7QZnHd6sDausJA9JrIZyZ7/5f/Im+tF7hs3E9Sq3zMpyWgeMz7bgId1zb5h3vZpZw+vY5E9XldabIy5i+kb14w== 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=pVP3ntQHTxECeCl0K/97TlO2q60gbvV5zmauZXYYMqA=; b=AbxsEpG9mlWmFZV9o9S8hmRrsiFa4FJiJPctnJYc7wGN2O1fzE7+OVeRH11MjVxOT8desVhvLNUxsXwq8IUG9UW5zjq6+z4XX2v8I5S5S67MOPD+zA67ig9rzdrGEg8JzsiLMIr0wPwp7aQYhX32y3U62nkR1Qymvd817KEwaldjICckLXZRi8DEt4/NTpqyMqsDyu+J+QjkZp8rBvzbQaKNdv+GC0GohlPhYUf6DDLieFlc9PvnPsMuoL5zkunP7NmGegwMyx7FU42phE+brnmccsV8U6hJlPMVfdevN46kHkYs9kIaMgNDc9zYhGO8mK7R+BFN+EJEKgOvF3qczw== 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=pVP3ntQHTxECeCl0K/97TlO2q60gbvV5zmauZXYYMqA=; b=gLjkii2T80rIhP0kDlFWWyMGALVjwLqk4ZBtOeiq3IsXJeLNZxBzeW7x3yLI61onGBE5H0wEjRDk8P/oUSL9dXSoWvBvIPYhjIi79Lre0L6kTCcmuJ1jrEFzq1CB0r5AsL0sXzl1YyDmAuISPPezE4YGHgLzD2EMJyLLWEvMCPbGiajGsDxAPkOfyPcCku01g3wbk3+4nis2GIKtbALFP2x5YcCOH7Jx7XBgxT/OaQ0tILUOavyr+oC5S8vB0koNsB816W5kwtgdHgQ8gJgfTkgCK5sEwpBoA/9rnneMwaiIoIpqgt9joT8VxdL9RpUuteZgh6gu9w4qjwb58j15og== 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:44:51 +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:44:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [TKVwfb6vO5hdkdkwpONzC6dZCkuhqkLH] 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-15-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:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28ab811a-0e4c-4506-bfdb-08d95d32bad0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRupi/Q+Rdl68aad3oIr/IHaOF2O2Ayzg1CuA5XXnX+8j+q9GyMrSmOdMmRUijtqX3tOUb2qP3BuI32I6gjdMY1WdoWtN9h8JPYgnd7wdcVfSG67aQqYPwYmbfQauCRpB/8sElR2yYJ6gQGX7+B1Ij/3yPS1y+eRM683VaC8j2iBRqkOl2U9B1naV+L9dg57MTZivLq5DfQ+FY7IY81EkN69CBJwqI1yNeVPuDGlSIO1TP1Lpw8pDECOJch6wF8fwjTRvnlY//djCle+E4CTgiQ2Yrf274gX6HExA6dZDUcbXM6wejFjGHYAj+rPlSFWTUmMR7jV5dccetUAN3GkTxCHGVB+uxek6K7yh7WGEr1cyFfs5EV+2zdsb5kg/+lwC9PRQC4KpK15ZJsImEAtxUAJj9LyKqNEpSFkmqbw6hKhH1vUPrn0o6Cag3YzpYFdJ3kgO+eYbIj06keOKo9XqLhiLuWNTasLTso+x2dxoQDFn3FYrGSkSl2gLsOoIG+QiTtINZSKu0wA73c5dGFLhtZr/RPyMucITCjqJNrWi/KZEjb2F8vlim8QuhwAyJ/JNpvKwClPpzy/rg+Jv8XXOLrZmmbjhzNVy4WzCIOs/Lvx+pMrqNmpYVLr2ops58yxyrHM57SInql0uN3v3qDcpBSWmiDOnHbuy8aTaXbEvumaSWNa20lGngM+1Qn31ptg/RdRau7E9A+eEotDvPFs2jBQpnuUSuFXT8Ffdq16eXSSo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hXQPTrkwBCcFN3LJZzVXxf4xgEFESKz9J6X+ZG1PfX505B6giFT2YU9AoSQFJjbL9gZYRnFQy5xRIaTwd+nzxIeIPP6xsrYfFY+QwN5jBbzgePCldl77BS/Dz6r3cP0POePQuvgff43odPbAnNzo5vqXcoT+TPoOnWddR4qHxIeqwVo7HiCjkA0hUa+0UCVb6l6PMf0Uc6lrJA69EIjSx9R+haCS45v8ckEHfD7DI3WARah+fdH9Fnr38fhoChMxzOlmLz98orRrBy9YIM9Rq9/aL87yezlxVwGrUTOxdYFG9pXlVbqe5eNnkv9rX103yYqHEBTOOYTlba8cXmItbW3C0bPBGfxQiwLbrvj24k35mxNsL+FBMAQcYa68WonxATZwf0/LZwn3jxUoVCJ8M8xUt12efdAdtDHx4yBlzfaQvxcvSA3JAk7T0O6zbnYK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FQEbRyZp8MqiOtY0y57vcD2rTmGuAkEzxuk+J7Rd+PPZSv7MFk3TIDZIL6cWjucDdlGFACw5cEYKuZ4btenZ5MLiD0Qbq3/W1wWjpkfdjDqs4JptKPy/RvDbrfq3qkqjxbiQ2YcczE4KL2x6zyFKlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28ab811a-0e4c-4506-bfdb-08d95d32bad0 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:31.5637 (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 16/23] avfilter/vf_extractplanes: 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: 9qlu0OT724Pq Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_extractplanes.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index cede3d669e..52602965ac 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -352,23 +352,13 @@ static av_cold int init(AVFilterContext *ctx) pad.type = AVMEDIA_TYPE_VIDEO; pad.config_props = config_output; - if ((ret = ff_insert_outpad(ctx, ctx->nb_outputs, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_outpad(ctx, ctx->nb_outputs, &pad)) < 0) return ret; - } } return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - int i; - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); -} - static const AVFilterPad extractplanes_inputs[] = { { .name = "default", @@ -385,11 +375,11 @@ const AVFilter ff_vf_extractplanes = { .priv_size = sizeof(ExtractPlanesContext), .priv_class = &extractplanes_class, .init = init, - .uninit = uninit, .query_formats = query_formats, .inputs = extractplanes_inputs, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; #if CONFIG_ALPHAEXTRACT_FILTER @@ -409,10 +399,10 @@ const AVFilter ff_vf_alphaextract = { "grayscale image component."), .priv_size = sizeof(ExtractPlanesContext), .init = init_alphaextract, - .uninit = uninit, .query_formats = query_formats, .inputs = extractplanes_inputs, .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS, }; #endif /* CONFIG_ALPHAEXTRACT_FILTER */ From patchwork Thu Aug 12 01:43:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29450 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308986iod; Wed, 11 Aug 2021 18:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgawckkxP8VDi9PAsCjLw32fg6lozprTvwVM/yoWQeZUgwKQzRW2TyRlWSN5ap+WlkyvVy X-Received: by 2002:a17:906:3148:: with SMTP id e8mr1382959eje.240.1628732835064; Wed, 11 Aug 2021 18:47:15 -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 ck25si1103236edb.245.2021.08.11.18.47.14; Wed, 11 Aug 2021 18:47:15 -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=Yb2R03bE; 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 1B36068A5A2; Thu, 12 Aug 2021 04:44:57 +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-db8eur05olkn2034.outbound.protection.outlook.com [40.92.89.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 774E168A569 for ; Thu, 12 Aug 2021 04:44:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UocDKZ/xaNoGPBWPO49k78KK4Z7LMbSHz8NVQ5hUTQIbHxUJkd8Ck937ZLlU1Nie8fG16i9m6IL0oJ7IEoyXIQpJg7Rnd4CWiZqngiXJapAdWfhpv+y/WDYhxbEi1pwq/hDRVxQEBbl0x9+E1gvHvGFZzZseL9krxGA61q+Gt5PbPXP4Fke7VV40ehaz+fFE7Yp4/jPxZHS06oqRrlP/zIYuKEgiH0LG/tvHmTZL6+CYb3BbKFjssdC1jQw/53cn7ARw+hzka/RMfbQ2cce1YHrztDlrt5T5thMO6yqsijeL1pOZ5GVMEKNLQPIyz6lj+pVdq0F4fghtWX0vMXTH0Q== 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=ADO90eqmfL2+4RfMSdqYcBDU7YkOm0F4ZuC4FUrzmLs=; b=fAdblHz5zw4E2zsGYM8Hkkicc5iKGbKq+YenqVocfjEG1vtCOlZHvjJzSLTJEMZVMika+BpWCs6RJb5d/9VlSB44GzvSvQ6REyQCwaOQTon4UNbpMqyi9vcAYRWSY5azvo9rV2rI6iG+ExczxAnOMvFIGKxYY+BSfCcHYNQJLDUfbVValIeSHBCIiT6se0wsOCVcSQUyVnL4Ja4A80e+tbXi/S38NR6PACKVQtlfCOtXgvN9mWDx1lfdhPlCFjz+xEW6ybnZNRu9b0Hs5N2+7xUnIOdR6Q9fFWsoOoXVhErmyGuELCPqK+2CAEJbqN1DQoRMRHUh+Z6mh6X5axTWhQ== 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=ADO90eqmfL2+4RfMSdqYcBDU7YkOm0F4ZuC4FUrzmLs=; b=Yb2R03bExC9X/nHPJR71Tv8qxUdrr5xrL7238OkoxfUTRp8P6jIVqzZsq10Fx1GCQRvLoYNSVz61B9pCXV4Z1Yz7gM1sR/1bYqecpXwkZk7JtTOQFh2N2H8PNmnCetAlyj3h6vSN3jcaNGWpc8jf+xIkOFgcsZFrMV6f2lOE5d5TByp1kMnC0JbeLjiFPdLJz+PKNaled4JAg1muNiWpa7HVWQtA/mukKAuYQ/lzjtepTnjAU+7eUDlXZuGBAom9b3ISi5i4LO/s2sdaogyRB9MP7pVLK2DH6W59geLfgn/bWjgmHuv3Oy3c6AyoGQ/F56EvchWp5LXCKKpu3bP1nw== 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:44:51 +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:44:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6QVh1tzhOHDomMtMrTYxhZf80C11hCPD] 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-16-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:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 123df359-ebb9-4e5c-0660-08d95d32bb16 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP71B6TqUQUtzEqD6Xt4WLKjAhDJ01C2h2iDl64HR0p8y+OPYuHCFL5+o7VAJ3kKLlbvRv824l1JUAeOlKH4GavCBJuiJ52p6ZZrMGXlNnOJa7l4wZnw86Sv4faqsoEP8UczmA6jEuU8hzFtZNpT5PSxlyO/ZJcYBsWE8RyvHSBbE3t9mFIAmPHZNnD5qIW7McfZTszhTLq2GrC6wOaY6kdYukTb1a1mtIUQurGvwH1EO4BZf9W9WVZnWewEfpsUBpy5rh2sfujwkMwXLpDnXefYEYLYHApI0oRRXkmWdMfXNp8MQsnGM2+95Q2q7BJSWBkFStjmD8SHxQTJDjh2AhN+re0SOxVKxaSm19gMPcVuh4iNNYCKbSIe/ovTP+QMVAxdtHIwg1wzKCUIUzhqPN8LJuQ0bygA0nHSAbw3Lu/hFy2eghdwPO+RN9ZqhVNxBDheLNUSwyDb8U8Htt/Seaw6p5/WTs/yEQ+HklFOeOIJBEmEbU065cosRoydtjNcGbg45JWZH12xj/f011s66kiHFwVtmmUBaA6HreT5pIlqUKoIb42hjIlB8rLHUCvf4fvEmpa57jHK0/FyXrATiPpyq+s5+qQ0l+pwZSsOv3cZU5HPs0/ik8xzZqzTNpMOgvGFwP+VltS1Dzo5FBhZVbtAeyfuJI7KpB2DggkRcyihpZtxF2Q8V+/YmtK8ng9J9bqRhyfr0uictg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VjqyhyI+/1rYZsg5mj9RDbqVlkomQUiBRwZt8OPVciG63/85I23J3bWQ7lA1lUREWsuedFO2zd3JucyIIVsNJX5gf0GvHOoVqOO89rY/NALvvEUYxg73JeHeFNVkdOhzlhnAxyjiqRnuxyWqa7q5Q+4iYLSRiE4R9ZSj+4x6WyJy5UhvazEnXw+YuFkret6XX/O/xqkLBo3tiUJQ1VV3NBrX0FWnAXgsAxuzW+e4t8ed0zRmEVxDrW57ECfNyJ5n7zfWSbhrbeNBd3j8e8ThH7zSNUq7bFo1SeD5IHG0Idfzq161v99A28EDqj5xPx+/yj+3Z1XnhBg3ddia5jAxewwm7QmWw4QtcqMnKIfOMpjnfFHaXSaAibjRf8ZkapN4vB2s6OaGxW0yr0uOqRa0YKspaiqaafjg7sHSoiTJMfCqHRy6lzIIunWozys9wxlQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K2a7w0igJbkukXju7lPJzK5OxcW+pMM6vJi6zinqKucHhJP2+lHIiVCtUMFEHrxV5bO6imv9seEnGdVkbaEl9O10qYp05yLPJ+aNE8yL6yKV0Gcgt+6fiopFy8ezm6XQK098hWd+CVtdUs/wwixkzw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 123df359-ebb9-4e5c-0660-08d95d32bb16 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:32.0297 (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 17/23] avfilter/vf_mergeplanes: 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: 1U5LQ2qeVrqX Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mergeplanes.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index 30888f62af..633421e37d 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -96,10 +96,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; @@ -279,12 +277,8 @@ static int activate(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { MergePlanesContext *s = ctx->priv; - int i; ff_framesync_uninit(&s->fs); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static const AVFilterPad mergeplanes_outputs[] = { @@ -308,4 +302,5 @@ const AVFilter ff_vf_mergeplanes = { .inputs = NULL, .outputs = mergeplanes_outputs, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; From patchwork Thu Aug 12 01:43: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: 29457 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309091iod; Wed, 11 Aug 2021 18:47:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWKuoRWuLF6MG1h+/0QsPegmhlgMmHuHrJIdVpgm3kiBdRy2+e2u7HPwHaRVn7MxjRlmNd X-Received: by 2002:a05:6402:d7:: with SMTP id i23mr2372324edu.291.1628732846013; Wed, 11 Aug 2021 18:47: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 h5si1123832edz.280.2021.08.11.18.47.25; Wed, 11 Aug 2021 18:47: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=ZGSJsffn; 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 0134868A336; Thu, 12 Aug 2021 04:45:23 +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 A539668A214 for ; Thu, 12 Aug 2021 04:45:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fO1M9RCRFBMNJu6bvbe3OaCWcrLQOTc99Q1FE8sQEdDUJAT3HgSNZfKm529mq3GN6T8qxQbY5hcV7o7vPhr4CnbKUXALP/eR6DOBZVz0Mq/aQTla42SbADrpZmn1swYrqfN9xzh7phQ800yNEyhMf7RVzqTLlHy1HFO7Ex68G3JWlPpzeO/FRZ+ow3X3wEuEXaArTHJvKuUpBw7VoaA/KDVU97uQt/eDCH8TtKpJxgVeHHAZqWF3afOS8mFky7KkcL9MqjtSlyxRbGQJ1KC0j4+SAGwCzVZltiW9ingbivmo1ik98g5N8csnocI3zNz0o/Wipk5qay892sxE5cBmwg== 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=JyrL9UbUgHcyRWV4fCYRNkXWXa7GYkPrhDsFpfzISQI=; b=gszLDUQaIMxwpDp4fQH5q1rbklNxy740ZklXqYD02XNOACwoBkpfeVT+L13aOpgNoJIpmXbxj1jrfk3chChQwhVcJsMV4BEcZmOMZqKSDCd9vyhkc7FkZyG1m8hQVFjYlGznAcO+2yltlKbD1idsWBefTgwgo49mumRBsdCA7Jb8Vi5QmMPLwezJV5xsDAZ6eBkr50jnv29uw748QetEXHRXPW/zIqkJvvsxC01WBwj1N/n8R91HVPhDN+MUCD9kjvjV9QY/Xlu6w62zl7gV2NzYsjB2c9RSC/6JnEdlGbzkZX1JDaegZcerCanpl6y6/JgUQatB3zf5sqr/NohLCg== 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=JyrL9UbUgHcyRWV4fCYRNkXWXa7GYkPrhDsFpfzISQI=; b=ZGSJsffnElE5XtepienbrVeLong1ARShpUh8Zerh/VgOaqlwnZQS9gBxnLtAVMB7Xltd+BnhZ40m5CPHUYLmrX4p9AK3/BSsucpmTEwVwvm3of1BYXG3uvcMWSFM22e61NGxoKpXGLVkKG8jToeb/Z6fLxW1LyS/kz/HM+Eca/MrlP00JKB75V/8a5/NdLZzHcOeA76PiSP+TxHLFmqs+xrKWkWui/KchTsKmBs2jgbAaomW3UeZCITPWCDamgIi1bKVX6/vJjqbqB1TJ760DBnkraMYuxxQ9TGvK4rbJEZOy9WZYD3aco/77P+c8ymFH2UZtJNLU9LrYm1WCMfVWw== 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:44:51 +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:44:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ACOqHRi14EJOwiGMFMswAcJ3OS5b0iFd] 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-17-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb4fd359-7fa7-4e86-c19b-08d95d32bb5b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR/bi8svvK5ODZLDz+aR7eyOWT4Ge2saWrBISW7Iq0pc5yhtyOJKbs5jEOKzbSOVxshxPINefhEI6GuMo2qbK5irwrLzgFmffUx2vzlkRx/fo5oZYCOdg6T+HPTteLDSEMv/1uzcY7D0E9E3AZpB7LHDOvu0GvMTyuE90hGhUaXh/wVAfkc2Kfv8VnWkXAWXOy27SVaMd7a6lKnfuzL2cHK3vi2Z4+T5ZbgACWMXxx7msHqisB8Rre9YoAxg1GjysuDm0cnORkV9AG+oR2lIZGgDH7xoMB1OFiXB/TW5Xe2keiNesp443LSSVtKxaF6Wd0Mqmc2d3JmpThYPUejG+E93LhWmWNXslmCqBs7f1twHEyDvE9tCARB5Lo2X0m7b8tQYcf3v0YVZD+06WSqQd0inEru60zgawPRfWaqgiSkU3ljL314gnwsnAL/hSYtdY/rbvi+bZFCdSuCc+4XwuQFiuxKoSZh2x5FRNDfSDZKbhJhkCnQRLri0sSsAtBFU3PoDlnUcUHsekJRBFQtdrzR+jgU/jHLSxJ1gP5+ho4Bw+c9OBOLiU4hCQAtU8agEICijTvNClufB3t7JEwWGEz4zDqDLa4eJ9MqCHECWVIH4oU/f2pSs05seEkFiHJ/ZuicCaUAwRteJ7gcaS4VbeAiJTn2Sezdrlq4o8D7dmkCobujgo4j7XjjpgoTEFqH/O119FinLoxGN+qXrdVboh/Wq0/Ebs15oa6Ns4whSt0sM0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qZ9YjjI3gmR2LBQndgGWQti9Pf4I//p8jcWhSymMfBgZ1IqAuMd/f4HebxyY9fYqoTRJlbP5ho4AUD97S5u3766qQ6AVfRtIpxDlztsHtf/FJDYgU4mxVudGsCMfRurCQCXJHGP0w1MJXCyled9FlvPdNcXWYrKodtDEKnA3dz+tg8Wz72DbT1Cp+mGT/B7QPLyLMF5umUNLwoaHAgNgStRzFF0DzEVvSf0NComPdeAE/KUF614fO52/AT4DLegJxdD5Y5P1TzUA9RLwIwFBdSk1mtnBjnJXoiVrEvtkaSVCtxLbRlO1hmTjBdq1Bza7xRqV8xAD4xFwFkFYKDaHMHHOdzzaegxEx+mYazJCU6S3fnJZ6nXPbGG069BoL+EIwCDk+iCAYyGvfkZb2yNg5ZpLVpE5TC3Rm5YFm0Z3QamB/hLrJMHxIGefRxhqDY8x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OonjOgZYl+RJM9nAFRgMTvHu7XTCcjFvx8GhPd6qWvipUQLHKfbbdVv1lvHRKfYlW6pxCX0D9VWAPVfg1+UGz65mf/SD0fFO9tz9bV3B2T6bg6H9UP4n+B8GlnrNzLcWHbhoKttzGC+d4Wx+4aj+VQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb4fd359-7fa7-4e86-c19b-08d95d32bb5b 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:32.4638 (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 18/23] avfilter/vf_mix: 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: HO8UK0WMIGaS Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mix.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 0ca60d5522..9f1400e729 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -125,10 +125,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; - } } } @@ -303,10 +301,7 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); av_freep(&s->weights); - if (!s->tmix) { - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - } else { + if (s->tmix) { for (i = 0; i < s->nb_frames && s->frames; i++) av_frame_free(&s->frames[i]); } @@ -370,6 +365,7 @@ const AVFilter ff_vf_mix = { .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, .process_command = process_command, }; From patchwork Thu Aug 12 01:43: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: 29467 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp142610ybj; Wed, 11 Aug 2021 18:47:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwttzDlLC6hsM+0mvXHuXe3S542Z0OJylsg5rgheL0hQW1eK986ihCk0KNSUt5Ej4wmwxHJ X-Received: by 2002:a05:6402:2889:: with SMTP id eg9mr2484408edb.38.1628732855857; Wed, 11 Aug 2021 18:47:35 -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 y25si1171826ejb.134.2021.08.11.18.47.34; Wed, 11 Aug 2021 18:47:35 -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=NgVDiJse; 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 BFAB268A5F8; Thu, 12 Aug 2021 04:45:23 +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 CC4EE68A2D5 for ; Thu, 12 Aug 2021 04:45:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eHRcqUB+BsN5bN/oY72qNxYmBJmA8D6UEzNtrK1wKvXQHfFLpu+mVJPDtC8fYFIPZMuvimT0YtA5+B+vwOLehFTUjt+JTzc/CvURkywwYVz5YJMeMWBLrdid7pT/A603NcCF6/JPIjy/kKWa+GwuWiUN7QNtLniYIJ0Bsjbfl9NXMzyGJmx5E1aCl7S/F9lbfCgJgeaJR/PQDmTLQPGkLyk3c2Pk4YRGB9ngZgYIY/gnb5JRjgOJ0exof648FeNdh+23ztviqbOdHSBeWBQP6Ksp/ARLyxdsvpyh8j+LnxkXrZ0p2kOG3qplL7HU0nYIsLxbDn4BryqxQ2+KqoFZHg== 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=s1X2SUWpMZ2lVg3CboHmsKngNCfsSf4OVcQ1o7YpLbA=; b=Kokxk2qVI00reOIWQ4FGrtEox/0wIWL5XeT74nYo3VYajaH//rNCQPQDkpcDgQkJRXFqMcQsa34tGvY5dpJWOuuXoeDmyIESgT+uOWdIC8jYp2IzPx+wxBdpEYjTRPn8H86KjD8M4104Cs/HDYvEKWQwDrAjuy8IkjDLBbDAjqsSVXCGayM+aCkXNXixTuEDOGBM/rGVImbvbH0VfJJ2JI1EWWhd5d6H6CSLTGFbKAe3j5Ay8BZRWiP5MqqRvU1tw4B29X/cn74blRv7HzKtxLszrCD1avg4pKGX628WyJi75SYuuX3up6xWhsPZaghPbxuOCmNCGRHIT9g3363xcA== 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=s1X2SUWpMZ2lVg3CboHmsKngNCfsSf4OVcQ1o7YpLbA=; b=NgVDiJseIRb1VoTq7YmFWjzFtxmZ5RqATG/yHbk4wvgdKjP85c0z/CZovsDPMTflmjttiF17qPZrHIPWJkGJIKC/0ObQZGihZx5BfXLmdq3e1EU7Zd3eFwaZykS25EnHW+CAvyraG2oEBwxpfY2nKA4IYqzG3e3WFjC9aBQyKfjqKKJbSXfxd/j/gBBkGCtDu9LIHM82BEcRHMvAgxqvKOQ9Qkw0vECHc90W1LlTYumB39M1Z5MZ4mjsAk+gNkFukc182zXLFaNMzMaIU7Ep0nLlvIUHEdcWOOseHCxEC0aY1s3UNYR1PdhWzXtHp0ISyu8iqe/qs1wXG78k4w3S/g== 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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kv4cglQO/soTnvSJj+PApOCkg9F/ni8s] 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-18-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f1beabc-aa2e-4752-662c-08d95d32bba2 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP7aEpDpUPZbsSlG4B2xm2XKpXAPLHYP8LK2SrsIXbDhdsrpcXCKtKiIB6Pe6cWTUMreM4Vd1x+c3sJ37xsI0oulRiBMuIPoeFpm24uhcmNJwBflgH1rnldFka8QoxvkNa7HRK0hAtTeq2+t1KFAZoY153ycEu8i9WsWbeYculuAb/NgFMvxLPxBSL33mzC5a+2OHIRClc1l+mqYpVCETUpqlkzU0SmFvnwRJNMZbfubVzdluCe5FZ6ukw3WfYfOnFL+mWdYb/ZAFe0Xp9IC/ru5YCSOlg1GfNdSL5+3jUsyCoOm8F5q+riZZKObeAcw44gH/Tkd5F2KaJAuUZTmsQ4uNYqAlSl3+Qo/+931c9kDObsAjU8/lmYlcj5nGp7Jyt0G4yEeGbKuDb5LtDCedFs/hAzaQXOULjl13E7hepPvoR6QH+CIYXGzejO1LfXeRB6BZJwKGCP/6qi2uaoWbdhLW9/JX69JRU3/rhXMZvl8bgAGkMcNV4mvPkiFBvAjQUHkQmUfgI3NuPas+kQYgw/v41HqaeowrMA4CPGP7Ctzhv6rAYqjrshmB2j1c4PqJTVJjkV2TEYwjUJCyOGczT8j/eC8C3ZZPS3qbYMc/1wMBsAz23FTXearKeY1obfouhWpPlln4hg8F/RviKhJrv3+TCI1h8ntSYwkzyhS3tead5IBbS9lYueEF3x8Ga5Jjcj2Imo0k1HekU= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bx7exf/q1qrB5iZY1KHJd3jbdXMo41PL25f/upwd3QTl4XRIjOTxWIikC8RyXZUSAk/7aiFkd4a10RufeoG80SQKoJZGWxyZ7K4VofBRaW1Pc3DDuQjtVhFrYPbtom//Lj8jmYBKqTGiAX7jcuTpwa9JRRT24OzbPNN3F/TXwpZ8m8fmmSCUNpIH+5Te2T0A/jEghbAN2scW1kW7Oz9+TuP1d/41KQBQI2kAxLtO/7M7jm1wQal7gNrUc3yQiY1qn3k4L7EBg8M3DonmD0CQimRxVhc9ouv3z8u2scT7XL19ukxhDc9bVQYcrjs6WL0ZxXzBynDw6ci+Ou190dwf4MhjujSaWZsiCLWRVwklPGyhqx4DCDloxGFV3ERhZR/vAsPmv4HpD0Dljp/dsnHUMyVu5r3iIAHAtJdKuU5GfAI9JwbJES2fQg3/pX9Yc79R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GPbaq1bcEFysiXnJ7+g93Jfgx91RsQ1fnywDByiDWLkMarkDAeLv64Sd3DEiOThVqorkzx0od/E0GmkO7DahJvRHPkcXnhwdJiATX6POs9eBbTePeFw5Y8JYQx0DED1/klchH1tCPMdcCzrumPy6Zw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f1beabc-aa2e-4752-662c-08d95d32bba2 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:32.9128 (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 19/23] avfilter/vf_program_opencl: 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: a+XvvnxNOXhu Content-Length: 1897 Only ff_vf_program_opencl is affected by this: ff_vsrc_openclsrc as a source filter doesn't have any inputs and the code where inpads are inserted is unreachable for it. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_program_opencl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index 5f455e9afa..c4f4acb919 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -288,10 +288,8 @@ static av_cold int program_opencl_init(AVFilterContext *avctx) input.config_props = &ff_opencl_filter_config_input; err = ff_insert_inpad(avctx, i, &input); - if (err < 0) { - av_freep(&input.name); + if (err < 0) return err; - } } } @@ -302,14 +300,11 @@ static av_cold void program_opencl_uninit(AVFilterContext *avctx) { ProgramOpenCLContext *ctx = avctx->priv; cl_int cle; - int i; if (ctx->nb_inputs > 0) { ff_framesync_uninit(&ctx->fs); av_freep(&ctx->frames); - for (i = 0; i < avctx->nb_inputs; i++) - av_freep(&avctx->input_pads[i].name); } if (ctx->kernel) { @@ -375,7 +370,7 @@ const AVFilter ff_vf_program_opencl = { .activate = &program_opencl_activate, .inputs = NULL, .outputs = program_opencl_outputs, - .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE | FF_FILTER_FLAG_FREE_INPADS, }; #endif From patchwork Thu Aug 12 01:43:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309340iod; Wed, 11 Aug 2021 18:47:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpHrRW6Nse1e85w+Ow2WxQi45c3eqtgOvdo6OJTkY0M13Hg5lscEWUZWjHmZCIUovzqj30 X-Received: by 2002:a17:906:4f97:: with SMTP id o23mr1370821eju.418.1628732868662; Wed, 11 Aug 2021 18:47:48 -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 de57si1178213ejc.433.2021.08.11.18.47.48; Wed, 11 Aug 2021 18:47:48 -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=RNkm+XfW; 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 0FF0F68A3B0; Thu, 12 Aug 2021 04:45:25 +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 EE77268A318 for ; Thu, 12 Aug 2021 04:45:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iFThiyrO4s7HbcSBk+oqvF32/k1qhR7w0XblGNbz1LDhodCu2GCMLuz7Frfw05GPzmdsKp0J4sClVt+UwZVL1f2u40Ai6Vq3cEQEv4/2FAvp3fsoyx6MBHbwrt6btmalv1OCe86SZanc42e6RGaBVWnHF+sZAhsMvkEUHXYgAR2Sd71vJJQ1Kgh0x7y1TEHo6F0Sgcfs5vaVeI2JCk9E/MeLwvdcN5qOOyvDnK/wPDnEyS4bubVzQAKSdAqweo2kk+lU9pdRKdS/y/PiyK48qrmHlds4cl7obkVdDI7AmcCvZCvDQ+L6CZLWk+wvtPmuyWPJ14zZS2jVBunaFRKzhQ== 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=Zxuc0+760r4KZB5FlFp2tQrRknHqxfFdy7w2duEscKw=; b=g30uXDb481qzWZtFtyiXWOW+5KabrI5ytnaSp7xMUKzMbRuqZvp9ZeaT+mOChsnAKH2TRcXHufRaX2kdMjDmhHIK9kDg2NXlKIE1K+Welf8smTGvuE6yyRyOwSlXBISFpLwhlehw/AtBJKsb+1iiGg+Jz5DsU6USITlY0ANlbFkbd3TShCOPUYcblM9RjTtiHhk/8pcuh1+O08AobLgZiY+qhf2vnmJJvnUEXQ4nC4A5f+gf6OC2IES8EvRQLRRPh2sDdDI4NxNjjl7Ylj9qFyI7OAVRbSjnex8V4TbeDfffhD6kKXFviHEg/Lnp2DRZVQ2Be/jzK1z5URmOlK4F3w== 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=Zxuc0+760r4KZB5FlFp2tQrRknHqxfFdy7w2duEscKw=; b=RNkm+XfWRrHPDZnXD7Bs4ry8fpukZFW6dk2EgM/zBzgx8rqgPm4YzBThyjXYqRKBiFE7GvHJ0ZX3KM+Te6wFgrvwI3uF6tXodmaGv8Gm5ZBNpDCOozk/pKtd9TMBn26atu7IUyCtPNjgOVSrkLbNcJuXRMOtrK4XbGNwzcIHMnMb8tswkDkbRIR6SwEgfL60QmVsxcRHIeh7hs+I2zf7qLjdsqG9T2TqRpQ76kjUZrkpCINLA2+wb9JH+FxGWDAAKXrWNJW2YXdBdzV+/yDznCksaqEK/OOHywWi4rA5TjXfuvQeK66gweEHbCJypjd3vsREsWTnJHs0uyZ9bzdw9g== 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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hTGXr0MLnzGENM85B8F/YvPYbRGlGYl4] 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-19-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: f3d3c8d1-2f34-4006-1788-08d95d32bbe5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP71B6TqUQUtzEqD6Xt4WLKjBIiogecUNNPSeE4Xap4Ss8mFyNldE+As0VF60R44AU1V+/+eZD0IkbMYg4ZohmYYlKQ6QxsBc9k3wBewwe+iE0TXhIpY3KjZ7PJ2ei2E2kNE9bCAZJYPO7+YJ9zZCFrviDgmngKC+oovboveCtssY7J4R+wBHJbq2pcq/Hk2iGoj6TUu6OQ12MI6ytFX7s7k/Wpmu7OBM7aee6zhYjQOlqdBBzkFz7w1jGB5LeB1qBwnxdHdg9HRMWsiOU4NVE8VKIRC5/K+1xbeLfinRiz+n5GgBJoHMekllrLjz0iZDbkYdoZpcJpsrjOZrXtV6yQGNLKojtK4CJQN8gjOiLiFV/UBDFjAGMEIpIW4pP6rJGDH1s2O35jSS6V24FzOdrO9Bgswu+Yxsoq4x0PNqJJ60SL63AdK2IvMYA8BNrstd25gWsso6omE6CWruVJnCjCAiLhQYH4vvwddBw4Quc3sihXfX+zrn/O63N0FZ0Oowr0sxUY/Cv+3GTGCLUu/x6Dk4ZwtH8siDvOomQ9kOwSA2jq2RN510VRCZ4NyabwDqeaP+9X7FQ4Ub7AjHWaao6iYJXWzQUmrIQLjL1SXJ4cAIOAVIAvpzqStev4/Z8FS1yQMzUzfKcAU3/Z7Ot7Laj95wPulPO+GZGZirt48hH6ORMbdYxNaeSAPiT8W8066b+kIi0gatJzBZA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jfg6PGBf6FI5GAwhwEefxXR5Cdmoef/KbG5GYulOg1RDIbRtE5qJwLx34MpPmoWz2PpWJpujgL5NlOg99Eqq/kmukcQMsuvXhF9mCEdpRjvhi0NeyFle4D+A2FEziUT4C6qzq+LqtrrklZgBuw7gfA0sXMwJpWUVYRuo6I8eZX6E7JNCvE/GIjumd8kC3elkSeHVdrm4WWIZ0FYIqODg+elt4NYsX9gcJAlPVMIBi49t2R+qak88orwAN4CJrkt+6rmzR3exKdlZG3QotlIi+ZB9alyAe3RHTsKTI7mPTdDtpG24OZHAij1yfJ6SIuegXoRgtMTLZKCuZpMlpLoKVNo51XS9rZJTiln1Z2TwAYvjWgNETwUAxHo/0ain2ePC4bA5wZZg7KQFSJ6g5d/KPgEK7KpC5dwlP5A3k0KhhxabdzfnyK140xzYomlpue5R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v1Z6B/1bimsDlx3icHRvbXnf4LK6pNNnnJkEw+lKG4ga2ShK8/1aO1LihhEaZr94+tOl2cB+DCc3afs1wNu3B0lp6Mn+aDEasDpb0H+6PTxZKO5GY4iqdKnthVaXjL54e/074u08IWGJ5afS6GyJrA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3d3c8d1-2f34-4006-1788-08d95d32bbe5 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.3708 (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 20/23] avfilter/vf_signature: 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: 7Q+DBHdSHKAJ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signature.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index a345ad6ebd..3f4b17b555 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -664,10 +664,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; - } sc = &(sic->streamcontexts[i]); @@ -730,8 +728,6 @@ static av_cold void uninit(AVFilterContext *ctx) } av_freep(&sic->streamcontexts); } - for (unsigned i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int config_output(AVFilterLink *outlink) @@ -769,4 +765,5 @@ const AVFilter ff_vf_signature = { .outputs = signature_outputs, .inputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; 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 */ From patchwork Thu Aug 12 01:43:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309521iod; Wed, 11 Aug 2021 18:48:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznGPVDzy+9n7o17L3cDYGxJ9lnd5hYKTQ3QtQb+KhIMrQhC5Xrxe4FJZkotBFjKEh63By1 X-Received: by 2002:a05:6402:70b:: with SMTP id w11mr2409652edx.189.1628732888859; Wed, 11 Aug 2021 18:48:08 -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 ck5si911194ejb.35.2021.08.11.18.48.08; Wed, 11 Aug 2021 18:48:08 -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="GID0//02"; 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 8A49968A605; Thu, 12 Aug 2021 04:45:27 +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 4BC4468A5D1 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=CiGGZA4dk2shRLDCIxwjlIJG82FKAkhxve4sGrMrzJwwkTLOT38uwGADEcQfTdkEcGQMT0EwZOdm5k4AnupNeRAszkcGLLqpFJPfQQhGMHEWlZEWdd4UzfgTX3OjivrWk8NANWZAn1t3Zf4pJi7pdACNkiFudIj652nQl4EsmwPfQoIdGwolJl/BEeInocNsCmUwO82fQtzkWy8fY5tqHy5/nN0z7cEWo/lrm+cR72MHCRb+MPoSxYaiJEs/FETD3Q/u8RGkPq8tShgKyh03ziyYEn/SUeH+QQixTAm1apNFw9Hh0SpJtQ4I7bAPQCNX0YkegP6ZzhrDaj6YCSHkug== 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=IL9IHKBcamVbWrz2MeKieiEJASXsS22mc8Wh43Jt3F4=; b=gab6dsgfQgX3yLBdSpfQcLI8zFyRBRh8vtceKLCDIvGip3uuVKztAZbf3pFN2nHnuqBgCDgLYVO5QCq7WaUZ9HFECcaLgRJBmhmGl9+UrBeHnclpeKQ8qUYeHiqXiscqMhBFI8HdlE3lW6D0x0wL8CnjF+nGsgxp+QJN620q7GITTo36tByZWaAVNTIsizIluAxQs9LIJ1hh++TVB4qYM+Rwp7LbJFqky57qb/S34NAYnmGpNcYmxh50tjSwFoIwXQ/lg+5uFEKJQqE01ZVuQ3UPpBd9n9ucU81zf+HsiKhDXHOYdpE8im87bxma1LcSXqUNRK9dYNXk5DcoxJu/2A== 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=IL9IHKBcamVbWrz2MeKieiEJASXsS22mc8Wh43Jt3F4=; b=GID0//02HscREGlQTwbXSaZcT9BoVlna4cp1zvdpDjP9sBq4v1b6418+J0I0osH8bXdpSWRZ6vtg37YuvRIWvinVENGfqhaJQhCX5imhQGSbFtoJvmPvsKLZHxqVX+an5zSPN38Nrm+EROxlgGC6L18W+Efnvnxz83cf7mvCnqkJitQ2knVSUgsfNAMcg4X97VUXLw8hb8GE1jFYZal11rEtef8DyAnBRCPfSfnctfpmtE+mCX4p9SLhcFGUc2Y2UloFBC8sK5lCwOTFoQKP31H/HulTPiobi3ZDpCGb+BnvShrN72Lq1V9KTjQU3kUrDScd0nHbSL0LGcrJB/klEw== 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:21 +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:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QsmFyLSJOilm0zv9X2S5j+QDX17HMvHu] 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-21-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: d713a8ac-d3bf-4fb1-73ea-08d95d32bc6c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP71B6TqUQUtzEqD6Xt4WLKjIW3WJdx2Er+OUVGGz9PkfXYDqKrE8j7Ezka1ZyF5tWSdlWCRHP7+9FWK4jPKXM17Y5GbsNhZ6R9bpsw65WH3OS5iJrClqwPjoLye66DBPns927013Rp2qxqQEHEHgbeqlgobEpQivrvBaqXsojGThp5vAJAgHWUj4GUhv3O32d9amr7x0+EgkBcD5EB84zF15U6zkOjpIfWvFThwUB0fgzX+QEnLpK5uKhnSNYtQcDOesqL2HyYDTk5OX2AjbL4u1Of90uOvG7kSOhjJ5fo1jLETsLr0aByEhERaJBZMyxlTIpEPcNM13iL6Klv9pNIy9VL8SiqPULf3TP3+qKNOZbaaI+cmy/sdYaSHTy+tB/uErRbv+vCvOuMNLdhJRFvpyvd5fuFJmJjQCN6Khu/nCxA6hn2/WsGt5c5p3jDRJ7oE0/4XIML4MYpDDZcSUls4jBQeSa0iAJteHXEEmA7h2bx7WIDZPo3qHGStCeAg/qOd4CRtAOR6b1z/VPp/EL3lnMQZ+vx1ZiK1jAmgv3YskVpHU4PKeNMBCb5pXdguFEsMPYd2KvemauqMiTlJ56hRHInaxVKQ2YKYi4981l747LQcPQbERCj82SXbKZHJA0dRH2r8RqdmuM3r8lwCIpYvWTZU6K5Cv3lxUOWQ0AnLM6PFhZ71pXj9aO3viXUpcJqrsFL0XT/deI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pEI5QSdWyKvG+keIdCZ+m96F6pKPscZvmx2TyrESjonQyCN4zJGzBZiBIqaD7nbsvBvAq5b1ygSIt+l7R+qHGlDk0o9KmKpeW/FBlY4tjRBe/XfgkPOz4T2pPf1hI0LETBuH2cW0KCr8VIJ+/Ii4tPAfEPZyAoICVbklYgSnGx5/xvtdK2dNqE6NFQiG9WwsGxnc7woTIme1lALdpiWrTecmhgq/exw4S24y60M4NxAhm3vx0KFtsRc1NEy2liw5+wBT0YRZapzLj2JZbFtrBXeycA1Ndv/zsM+EVRv9bi8VI65QK2srbI8Yjj6mBySFPh3fDZJ8G5xTZMVJkCqiGgxJDnddMkxRRpdrKnXx7rEYv0y0S5E6+qtJ6PBCZ9SkvATl/VlECtfREKEqOUvGIfVsAqazzsoStvYPeirI/wE/vZyi5oeqX2cHVIM1zquZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZkNVQNt8J3JTVnlPaNr1AaxFzLgkOSjxGtC8w5KmsXSVgXftj+Q2cpl+l0+RUykx8PT3i6PeKmRE1VJPsmwfW+kGwiB2opMAEDK/LmvoaaOMzvNnUiG06IbpQoEK14uHd4wgp5ng9igVBrAdUJK4+A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d713a8ac-d3bf-4fb1-73ea-08d95d32bc6c 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:34.2649 (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 22/23] 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: SaSBPor/0Ubu This affects only the xmedian filter, not tmedian. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 168a5944db..c01f9ff202 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -121,10 +121,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; @@ -337,8 +335,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); @@ -404,6 +400,7 @@ const AVFilter ff_vf_xmedian = { .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, .process_command = process_command, }; From patchwork Thu Aug 12 01:43:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29452 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309632iod; Wed, 11 Aug 2021 18:48:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZO2ABTzY30GF0LixzyKQfk5raPkCK9u5u/UvWRi0SLFIgyf9s2zUcVc364p/fcnifNwlp X-Received: by 2002:a05:6402:881:: with SMTP id e1mr2500206edy.53.1628732900197; Wed, 11 Aug 2021 18:48:20 -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 l20si1117127edt.377.2021.08.11.18.48.19; Wed, 11 Aug 2021 18:48:20 -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=R5w5nCmc; 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 83C5268A2D1; Thu, 12 Aug 2021 04:45:28 +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 6E41C68A318 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=RREl99Kf8jE5VUbNMdsKuDfrxOeymLEfeFRG+fYiCcCKH/5tw28akc8qMW7W8x/Hape5kkfWGmjyWEZ30Ehkl73HLic5tvSklgnrpcYolff4AIpssDPhORTQxLtVxkj7Xi9h9UQtYj3Z9FK/bZXH1PbFp887oPVWbQOiS9wG9K8j59vbVSu4xnYAVAkJygESxLM6cAWCS6xdZyCKv8+SCobfLXSW0uTQG7SUQ+loA3KG3db0/+xLLNvQylfTYaJ/16r8Df4TeoUnfk6EdHeaBZnTbOYeMom/xeWnyYbhtrysB+17sBtLHcEbt1ezoxPB7TWz+1HhwfJt9y4ZYmf/DQ== 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=+Wd6nL0FAu7jPAePjx/HhxZW7uimj4kLKrG3KHnMkRc=; b=iMfOrrDe8nTRsSKv7Rp/6DwccKnDUycXioVABIUpgDLs5foRBZnnVwEZIY+Cord6c4VezCPVPfrqzW6PLvVPcDBzlv4034N5tIlhZv48uVL6cDEl+Fzzw2YuT2sq/ORCCzpazDWdeF8Uw6le8660D4Z9dObSv1w15kQIOR+orZq+CW0A4dDqGptjiWd9LzZ40RMj3wiBpG5QAYEEhMsrYhHiD8Yof94mdNaA4YxvYPGNPBMI9gmKyEQeZjtPQopI1O2NHdP3brSb0GjX0SDk/WxsFE0pIFtoKlQmTDk3cciKb3i5J0oxefuGQiF6RVYOMA+S+CdvMwcMXccu3ew2LA== 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=+Wd6nL0FAu7jPAePjx/HhxZW7uimj4kLKrG3KHnMkRc=; b=R5w5nCmcq/AqDxP4G6K6GWPieSVlUiixcXIej0VXMdapZ03kH6kvCpg6B93F2N+HYFgH1H9E5a0HGiUdmIXD1UfDJCMwWsIBILAafasMR02lkS1/zfMAdU4x7uNzaVKHPNjiiWsEFypc+/jpjFXKlhQ3Elx5lmQOzxtwrK7bdSkOAugj0ZdksCZG/JZKt8wM0msWL2TL9dTxi+RVOlRU3xJRm+frT1XvAmxiLyTQZe1KQ/Sb5BQR0WW22JshgMWCKZuVbwl5GZTve7fVdzNTfz2x1jSENKHr1Aw36bGHSzYxTPQocxZgMynWaURKpGc9SYmCA7fqfMcwCLjkNFbs8A== 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:21 +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:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3OfrVsvmAmxsoPZr5wvYWlp5uuwFcKBz] 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-22-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:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 530ec620-f7fe-4409-f195-08d95d32bcb2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VReVSmTnGtFuNoiNWK4UKPDcxACCdLkQdIFYdKO3qofIRS0Vf8B7+QTsGQZUfrOZL1nHcTxtfTl9suxQRbykT5g2I8Y4yw4RiTSpM842OgmBs/t2xTmKgwMGH9FRsGawBHA57YeJ77vapb4rVoPNnYK8uYlvVOQbu57UJGAXLvl7k/7s8/0xgusvxjxcRJZWPMvacDq5yTuvoSTWphBIX/A9hzLtF/aZcwdZInh/TPRWGAzh4gYtwhp43xWMz73qxS7GqWkC1XsB04NJSSryf59biJPFfzhvBEve/zjgFmv3ppHG8f0BngDMavS28Xqm/oVg1C8QtB8KhBBHgOrBue1krNzodKHT8k8ifcKbcqI+pWP2usP29DPUHJz1Bq98AGjUHSel5lmODKdebFtWZEhWpcVA0F5sFIEQAXIe7l7uDMvVdHAYqFQafHE6ZhB885Gavo5NEV1EHpWxg/gQrM7Pt2iBf8kVuY3a4ojh/CZh47Sb21Fjl87+36LdGOx3shn+EMqTqNiPTFwatWb7sYnevlKwXkwcVOFissyXAIq1A/0cS1frTvlF7rp2FvK5IQNWnBMhjRefOjD1maPxGwXtCXeTU82nGMotVYvfTvB/d3+OxMeJXlODhgxyyLEabi8ydTzdhW6lbaFBRUylh0gVc+q7uknFfEQsGCukRN2nHINBiya2gGs3aFYto2yBET9LV/ym4fuWxjAUGTPtWNMGGRjEfUE8355yjDrZ3GRNY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dw/6Al8lEAiKc80YNVA2ltY4MInzPN1+QKDfj7kl+E3YfLiY5my00FqEDwQgGvDaosQ3wnaD9/GFweKMceJIWIrEttK5U8e7AVojVulSI/a2frMaNcS2r17LlrkOeJCuwzKN03Xkkatx54334ftqD2rIerFNLiL2JU9ORjN6bD/Ym35EzGYJonDGjaZvOqUzD8ylNmSEAo9IsFEjCOeumZCViQz2gJzddwtHoAN+46GfOq59TYGEP+eh8nDqE+iiPLazAlEvqDXEMkvAcif5BKZhYwphVmpxvf5TWgA/AV4TSprZScehUxFSKDoLJHearESmeX8pnUTMIG65RkCY7M2b3cuC+eOopJmYz6Cvfj9RAHoecKNdo9YZGUAaAb7pM1/nQD9dUQ6bKhXasYjgHL4sIja2AWzu/G0q0KlS3322V+HHR8wvT+zVTlYDDlgV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TtjBEcflKaCc2Nv2KBUcdThb9B5ev4yiVZnlIainLqrvqoEIsq/sWN/CFB4Y8FXFpEOlhRk7KPkZpaMsvt0rvWwtC83MaBNdkhVFbguRZTO1TE76kYNxbXhIOKF7t2icZh0P7DavHFy8ogEp2I+XgA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 530ec620-f7fe-4409-f195-08d95d32bcb2 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:34.6989 (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 23/23] avfilter: Remove init_opaque callback 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: V5HdgFoSz+RS The last init_opaque callback has been removed in commit 07ffdedf784e86b88074d8d3e08e55752869562a; the opaque argument has been always NULL since 0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 4 +--- libavfilter/avfilter.h | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9ac247c251..385720df82 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -914,9 +914,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) } } - if (ctx->filter->init_opaque) - ret = ctx->filter->init_opaque(ctx, NULL); - else if (ctx->filter->init) + if (ctx->filter->init) ret = ctx->filter->init(ctx); else if (ctx->filter->init_dict) ret = ctx->filter->init_dict(ctx, options); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 360f63bc45..5a225ffc44 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -300,13 +300,6 @@ typedef struct AVFilter { */ int (*process_command)(AVFilterContext *, const char *cmd, const char *arg, char *res, int res_len, int flags); - /** - * Filter initialization function, alternative to the init() - * callback. Args contains the user-supplied parameters, opaque is - * used for providing binary data. - */ - int (*init_opaque)(AVFilterContext *ctx, void *opaque); - /** * Filter activation function. *