From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6570D4826B for ; Wed, 14 Feb 2024 17:24:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B42C968D205; Wed, 14 Feb 2024 19:24:02 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2100.outbound.protection.outlook.com [40.92.73.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6A5A68D1EC for ; Wed, 14 Feb 2024 19:23:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NAuutHBbTvokiqeZJ84134sYaJMUJwwP5QM0CigFwgiD1MI4vH18o4CAGHdNRavjt16ptlty9FZUppLQgs4EDQR2uplOCZ8tyuhoGFGU02OJSEiAe7JxBjfHMX1tz80gIAzJg+A/B9OQ8CLN/5Q1/93jFubacy7BiIBbJGMYLdFQTL+TEWGZwbMxbB/c9qjpzMg+RzhGsFBjxoiC9XyT+TSa5K6JpmdYYJJHuLu87LpHK0krG5fLC3Ad8veXLA46UuggQ06/OxXtzU+QLOVWC4ySvUeAcwPASh81rA/6vspw9zEdxqlHzTxCs1HDBlIrnXFQaN7qYGXWf9k+ynKPPg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vL56I69pnhK36P6VQdsjpjQepeEaQUBj+lRzfeJRMH8=; b=P1pOy/vr7F4M21fHXU6RLvJs8CJQPbMn2hu/voxxtymX3vuNhw+IjckELVe6qV/8oeXUUVdJccOwMwNIov4CtvvjzyTPfzqO9Qe6ZJJ6L3V9q/5QWivG8chM7bHq/ZQPbDo/sNSNl/X4g4YTheNX4MeJBaL6XsfQTVEPvLHWorG4v6CQDi/D7oLEJzLfqhk09PHtVLJSIVpy6xQMgDnXDxgVKtFcRbHM0oC2sv4vtWObvP3OUWh6EYpGMQXFvd922Qh/DBLhTu8P9oDUVgUZ5kIxJI7wjANpHxyjOg0VZAIf6TZe54pQAUAD/uIL4vPEZsZYIT7/C16d7F1t8g8gXQ== 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=vL56I69pnhK36P6VQdsjpjQepeEaQUBj+lRzfeJRMH8=; b=X3kiyO/wUcl1Fb+DPw2JFGOCzPVkC6WeK4AhJTtF8fTPOFZmIloYMLPGBr4q1n8NQBMZMSRibNpdDFvyx05zvA16Z1kZrFvyXxOeQ0UJPgoj0Ob/YqD53Q23Gye3Eh1pVyXSYaXeib9SOd/iGssJsHP26GQ7hbz31BeiFwDK0W1RtlC1GHh5t+dRPUuo0LOpXQgLoh7HAyzPanuLsjDS59NntSqQa7TY3PKsgp/Pi7lLjnxcq7gxS7qE9dXhKQNmDftG1kWmI/ru4vmTEPvEjuYC6R2Hv18P6Cp6dD8KMsXRx6cCDdyjmVDgY5DeXXblzKFR4tFrcQ3jWwU0t5c3qQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0374.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.39; Wed, 14 Feb 2024 17:23:50 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.036; Wed, 14 Feb 2024 17:23:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 18:25:32 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1Qs+PVJAT1d8wOFPbpzipDB/s79hY9zbzV8CN3m2qkA=] X-ClientProxiedBy: ZR0P278CA0001.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240214172537.1099404-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0374:EE_ X-MS-Office365-Filtering-Correlation-Id: d6639892-8aac-40b3-f898-08dc2d81b5af X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UdXDJBO/xmUMNHjvu5SOpR3Va8I6p/Q+kV7BCLFUzvC89d9hfWTxnkFKV1svT93NX63bhAlkjUUVD6gcstPcPptz5g68ISwzMkr4kvlbcdxl+J8en+FZRvYEWivWaMrTBUFkcIDGw8wonOC2uFJdX+GdoMH0E6E6szuTCHXQrPs7ZrRKjo9CX36EjNtsEEk0svvSQYBja6AhC/O5iLSqhcOlEi5RxBqEO7uU/B4eZeOaRYXBXPgZtN1Jc3DOJPzq8sDrVdiTAqHC3pHEQD/M3JMmK1UX/d5pJE6eExlq1YiVacp54DTyLlsNWMAEVHE0/KVYobvRP+2TweIq3/9OmRUCYiGEhAv9YaQfNHPMX7vlX89UrJqiACsr/CKuoIGZwQFw9/f20X90o1CjmnHwXJ9BLsRCt2YeuJwuy40VvxxnCpRpPUJc+3XeZVk2RhuMrQMG6g2TciHYWXastsSq6IRQW8LkjfvxNAFNSGX8EoOPlptWzQL2owRu2sfbHX3ZWyd6Tc1tcwN57QoknO1uJW70JUrPJ++4aK7ixo5Qs2DGsCqUoP776UoPZH1yEgEj7ZUjBFPJQhme82AiBAg/r+6xVaYDikV8roSRfINUfLY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QVDUEkMvZwgHB3jAkA+bKh7n5N4aWQY8mWOh5FzFVPnRBfoSeg14nO9h70TR?= =?us-ascii?Q?QBs0xmb9xvxaNdajdBtT4NWhD2ZivNlOexmmdSxsyEcsukxt3fJkJFuda7s4?= =?us-ascii?Q?zpoJKKTS0+rT//HA0f7VkF8Re4MQPNFhCa2Bg53hQdDX8EYixi62Rero5qj3?= =?us-ascii?Q?LrtqMih+FVXnvD1fR0ixZrBNDSupoW/GHZsSKrmdND6VFF1b6VRGG+Tx+o5E?= =?us-ascii?Q?gk3S4mYz8UOrq1F6gfRkBXO1lUbdZUkHtYvTM+/r5RjwqI7ZDgn+W8BtZ98d?= =?us-ascii?Q?w6edsI8piCEbIOflVd0qh4giQlEkSsWigWXs539bI+i3CUykya7TX/v+iN7K?= =?us-ascii?Q?URn3qQ+IrdnuFk+5JZ/p0OJ2CE241pIoFsvF/gUXbyDcivVv6CDbzrcb5Ti9?= =?us-ascii?Q?aYvTgK6VPj8JPYZ73vJ02wO4sRjyYVVk29OtFAIAVtKTEGjvg/bK9M6fnHVC?= =?us-ascii?Q?B1BtPGiUzy3uame3RRZPtm0UmoSeO1BXqqABuzdgpkpDfs51xEHoG+PBX6EM?= =?us-ascii?Q?knB2e9L+hWrIudI8vI3pdI6nAhEPU0LnxxgOD327pRE36asBsXLX+lyFsS79?= =?us-ascii?Q?EUL3WZFzwgkk5zVEHfYWce4XmzegbJsAhcE81KLN8fkimrAZfTvVgTzzN1Q5?= =?us-ascii?Q?HvwksW+Bzr4ZNAGVTBwAktw7l5EzE2Czn80jMgMecnEN5HjAV4EZsDRzF+Rp?= =?us-ascii?Q?7SWIwkxcgTh3qYfKSkdYUZl4kt31iNgtOlLtU3rWq0a1m3Ve6ByePQFTZhnc?= =?us-ascii?Q?QCyz5whZLhcz5AgEnVVdNXQ7KmT6xOaavFqmj4TDn+a6eli7eMsY41BU2sdn?= =?us-ascii?Q?lsOmh0AJa2Zn/hXYIRwNvvnEkwo6Q+VbRyQI/dFF8h6yEqjC+3OVcLVQFM4U?= =?us-ascii?Q?uCT8Pvpz3Vw+Cn1MCgPyp/F6H7Kkl40yZlaPjaPNg840c7SQwgb5YDOvmuD2?= =?us-ascii?Q?x8FL3C3Legv7RjFOXq6ROwgEwjh7p8jLo7gYcNAesMIdF61DJnpHod9Sxk6O?= =?us-ascii?Q?tbKpzZyyRFLc7yGghwCef9D3GIXQA8Zktva731CgE1iNot7Yec4Lv41A//lK?= =?us-ascii?Q?mPvXTf8vNxCHuYJ9m85nyoSMeRFQo4GWxTANwJoJ1CIX0KG67rmEqgfaKto2?= =?us-ascii?Q?r7EgLEe0dqEpCT/jsvk4h3H4qMROtLfUIinCOytjJag2UcRmKcLljPYyPrq1?= =?us-ascii?Q?g6aDSE4WGCF0kl3M/VmKFR11Hg6sZMxP8gYzafwUFaCLg1+RKqvMs7DBKVEO?= =?us-ascii?Q?19Dk/a/vqFXhBL3yoJbR3SxYPnw20jmrLd82829qxA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6639892-8aac-40b3-f898-08dc2d81b5af X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2024 17:23:50.4258 (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: AM8P250MB0374 Subject: [FFmpeg-devel] [PATCH 3/8] avfilter/avfiltergraph: Avoid indirection when freeing filtergraph 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavfilter/avfiltergraph.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index df22de03a0..a9befb954f 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -117,23 +117,25 @@ void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter } } -void avfilter_graph_free(AVFilterGraph **graph) +void avfilter_graph_free(AVFilterGraph **graphp) { - if (!*graph) + AVFilterGraph *graph = *graphp; + + if (!graph) return; - while ((*graph)->nb_filters) - avfilter_free((*graph)->filters[0]); + while (graph->nb_filters) + avfilter_free(graph->filters[0]); - ff_graph_thread_free(*graph); + ff_graph_thread_free(graph); - av_freep(&(*graph)->sink_links); + av_freep(&graph->sink_links); - av_opt_free(*graph); + av_opt_free(graph); - av_freep(&(*graph)->filters); - av_freep(&(*graph)->internal); - av_freep(graph); + av_freep(&graph->filters); + av_freep(&graph->internal); + av_freep(graphp); } int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt, -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".