From patchwork Sat Feb 10 23:04:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1752669pzc; Sat, 10 Feb 2024 15:02:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX+5ui4YLBVVSdp1/Bakn+8b8S8BTe9Rxc4vTOXMPWwKp1YI93QE0YqFJuyBpmLMbziu4NUbuv+CQL4DZBppi2R3cIZ7YtrJv9WlQ== X-Google-Smtp-Source: AGHT+IGha5QquI9in+BYmDuieIqhyk6IMw6kB/JUo2tnsNwfe3ECfaA2QL9VpYe8hFgQ4ydrEfDf X-Received: by 2002:a50:9517:0:b0:560:1f1c:cccc with SMTP id u23-20020a509517000000b005601f1cccccmr1810662eda.4.1707606172933; Sat, 10 Feb 2024 15:02:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCURmnuf3K7B2cH0tdv8mgghyPBuKU6kYDLUdxLXsM/r9NHd3+bVH7X52i/0vSZ2jNUzXia8H8GoG/oroWWzV1WTOrGpVXwOzfoRv61z0pjIFQ1kzv3Z/mNwCAikLCyN+4A2h9n1LhsIwW1CH9emUIqVaxfw2OB+7CHmBwSWix9EdsElHpkMbGhzhaAc1Sl2s1FEJFTu6FZ8g1ikx5Ky0gjqpLqq6ZBM+TekIdke0lilXgwta7WGw5l/t5wliD7SasgrQfJqbr/zdWle4ixTEkyPcL39UvBLnCvIC6vxSZLKaXTCeoMAsX5hYLGOjeesgjL+Bn1VBWpVEf4dTXfSKlZL9I3lywWLt3rRdiwtEd5P5aKBJDNXNmJNyH9gYELEGXPASk4x9OP6Og3ECRAnFJprbT/Ez2Lw6mvSENKxGuMhhHx75WqMco68EWezGwETMN+/o/jor2qaxSVWHlHN4h1sRdkS+GfceArUIn1nsE6bF4YinQoBSQrN3gK5gE2t4EG1ycMEYjEAzn5LZf6aLZM400xHruW33U3/9jEzpp1FLrKjs5tBNKpRdob6FOZfra8cuOitxWUQmRDaAmXTdf3X0QBxOd+gnXicGo7dNFAvivl70hF0MLvWobYEgNQArFBvOz69QBLrFAi95VVSJ/gGnqbHRh1FSUs+rgZAFY7WkQ7Hbd3d1MscBJAjOIUSeu1IQwDNinmdzbst+tXZBYuOlYfrr9rpQ78NZLBi8BfBUb9DkRLeFgyg2d8kZCAaOvkViQq2BDkhPoEbH6OfBcvBFSvlSnx+cGmAnQn5bPW5pLKxQ0WW4lB4zmmY76J1YTh7EvEKBGHGahmfaXfDM3v4qXvnbxQVg9P+eUi0AOqlTmWRMW9+1mFnpaCwgtL/CMhjD+iFYGYYySQWbHoOANMo22uH7M2HrS0s6YUHb8x6FYQUCeA7Ps/lbNW4mK6T92BpkR 9jX8PciNTN80mWiuevz5ELeKMWUM/y1Mbb/EguHBCQ3Nfq2Bc/e7o191wVb7EdJ2VPsHWhYJ6EXmlT5EDBRgMefQMHWgnsy+2lgYD3rxrdJBZCWESw8ZliW0dYt0qtMrnIggkzQBM13iXwWoXkqZTvYJvdZDUhjU3eZKLQgMPkJ3AAqLCAtpyDCAGfqtqVvEOCJTAAjvlQKl3QvTD/v2RMwud56VGasBp357Uw7uqrQfhiM9/dUZse9Fu3vC1HPdKu/pbziy0eckWL12E6kSGVJmOlinT9JIQzqP28CY3i5Lfmb0wDztwOzRoJj+Le9in3OwltADq2l4CCOvNEkB9N7pAvPrrckS2EUDKAj5rTBz7eCL4hciyMfq2o+IszS8gx7LuVZv+mA3ReVoM4W2F8RxrJmgHWfMGh2idshvXaTr6rdrQxhKLlNHdjSqXa5TUth4KUJXDl7eIX1vGyCpS8MSXrxfgyOpeJK1Beihcss1PoQilmRs/hwE33y5SooiB5jzXEp39LbuBr97YkXrr9trh2NNpV76ML76hkcTqZ4u9MFeaiGlkL5gDckpDW7uml5pBCN49lHZMtyL7EQRhUTsA8Nm/Vlr4jZg== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d15-20020aa7d5cf000000b0055feb4df095si1197245eds.685.2024.02.10.15.02.52; Sat, 10 Feb 2024 15:02:52 -0800 (PST) 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=CSVOUipB; 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 80C9C68D0DD; Sun, 11 Feb 2024 01:02:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2058.outbound.protection.outlook.com [40.92.73.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1332E68D128 for ; Sun, 11 Feb 2024 01:02:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DNTg3p81EhRz1ok+iZCtwL2k10yPHBYtsc1y4roJHfRvg8qdJIT0xvPCVHZok/VBfTcDDvXQjx+AtrIHk5wryoVEGkUhjECbcksE8K3HJYTdJQ9AphtUyZmKj/qzPi6vbNTptOQc759ozHONqQ1vVzMDi36pJzi3HAZBeeWRJe0Xm9B8gw+VVcNY7c9De7a1dkyIap8y4lxOMjq3SPAXq3XKzfPE54sVk6fnKDCR6QUsaRASWTYeRQ7cNnoMaOr9XAU3TA2Nhku/vYr0zZyGKDlsEcJvp6ZTSioM3xMm0yj1siTCNiLCrFq/65e9C9GrTfYC1o2h1amNoiV+JLDBjA== 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=N9G3POzUUnQ6xtDtaQSo24KiJqV2XsiyLWpMDbib1Xo=; b=bcLAvMUb6p739Y4UrI+qVwsuTARy8tBBwbV1Xt7S6MgE0CIWv5vh+ECuPg/6rO6l+oTlGEgRMQtAb5NzKDmGqGN6x/kSY+uW48tma3xoUYo+9FcXykZ9mkr6DEkT6NToO3tLtHluNY6tz6qstqcMTZVGLRFA5wxoviCSrDVB/h9LDm4tgBVpl4g+tpS9IFQZ6Mgl36q+HUJZuYIWd0ZQs5ZR5jsUu40XpaLfEcTFH3JVV+skNubKYNAMNjYTkWkzPdNNqtL/cWcwuxmvLqadmHVrFWsWRrJDr8A4Y4eDSM9je5s4+I4IZO93Cwkl4J029kXxGQ0PP0MJinDNxLOr9Q== 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=N9G3POzUUnQ6xtDtaQSo24KiJqV2XsiyLWpMDbib1Xo=; b=CSVOUipBifU4WBWDSMELFPDxC/Y1TTldOqfX9Pd86DFn+Xc517Yzz/sulECuQJZAxL9t7t8nQ8fhJEvVkgOsUio3WO8PhJe9jS5wrjOQ1TEohAOgEWwqERxgQl6D4a29O/KekJLwj5m86p2xLVX2eZacvUMOhQ7cLi55/9Dc02QUvBTIFfOwC/Z8qE+RJjTrCn7PAlyjWrRBHtwXHvnOZflMT4mRT5X8sVAP4qRVz63Ksw5fQsAYUVx2gPvfLT1zKcAUdmXgR77a3QgmOOYz2O76xc3w3anLMCHjwanQaBbenFCkvihlEgZrIlffwmIUO/WhJbmw4cKCc4TfRbbGJg== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AS8P250MB0037.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.33; Sat, 10 Feb 2024 23:02:31 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.033; Sat, 10 Feb 2024 23:02:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 00:04:06 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> X-TMN: [lEXOR9VXPVeFz6Qwpg7UdoxFb6qch/G51g3ZTQN4tUA=] X-ClientProxiedBy: ZR2P278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::6) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240210230411.2616270-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AS8P250MB0037:EE_ X-MS-Office365-Filtering-Correlation-Id: bc6a3b45-fe6f-4222-6810-08dc2a8c5c38 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpfz+h1ENKTbWTxnFGbPVjdZq+qbyJHi5reUj4SIbKGs4XhXKRqOppkr4sZCvw2IIqYq9m4it5/Yg9ukxHRQq9MNYbPUZ8XDyTSzAnMfAdqjc27yBCcTSHXldqdGxszNm+qhm+9xn3YeIaM3gXoMvNazgynWFbRqm0ruMnXiYHoMhZUCG60761qetbrl52QjYAXnt9XYb65p/C+8XGMFvw8IgPUc68JAshocWQfAo5lyfkbG6Rw6at58S1EkAPd6IsNpVWQ/9Y9PguShFg5WmjySnmV1oQlOmkTAR7VIOn+LVubUFCVizLUOT0g6OH/J4WKfmBJrNk5/p6yJEWwZc5Egk+XYxKpe/ctvfqtQnK4f5u1SYEfdx3juQgV63DD7hRtf0HzCl4UZzeGtRv6Gc4jyHgg3z0hfQHumq8dtom05ba+9MrX6fjB0NNqePZV873d3qXLnE1yEU9KqpzIVei9gPdokMeQeAn06ZTahChbAhMzUyZNNZMwjZMg18Cv8KGj3CDQHtPKngbzbiZVXrzLNd28cCwpGFdsJiSpHUV3VwmP7yW7sLRQUkKAicu1FaU2NS1jNSbMqEgo22vGXq11eT5uZH/Ei6466GKZdiuF6lhc/BvFpUxPZE0Dxgof698cHCxbFTOmCZB6h10x7Z2mnoRvoHV0ggJAJyY0jCnBmQz/6Id3U4HEYA89A7BcvIEGNU3PDRqsdW9jjfYc9kp/Wa3pYyec3jr7k/bVkeFWvm6fq6PYhQhhZeaHoE3k/s4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJtsT2sxOXoCG3jawM/30bCyjWMZdIuTFdLIqKpEaGvaxFypgit9Eid4useahddcvgdW86nC7MYe8ELUBgHE1NV/70qBBZI4kdInm4GFNU5fG0y3H18YoyaDvs372zpoU516m1l5/CYVTPAvm/cccf38s1gU+xMWtevf/X5UzqTDuIGE9Y3TdiaxBQGpWU88y5mlNbqPZ3wt0+VzgNGioox3mjPBv1DXX5EgQYazorjifMAw+rwEZH243ocQcj2ww0iy4eJqtYyxtkp/odsCjtb4F7vIbOnz9SIOX/3PzwJBMQ/bRcm6wMcLEzgXW2yzDp7rNwwni1Ik8wM5w7b5doyh2p6KCoDr+ijdAXcw27D5QYa1OSQpFovuIJLqs5f5cNBh2/H04Co1AJVaxvmLbj+Jd1Wf3kzr9Ses6G+hoDGQJgqC30oV9ysHT9LmshftSs+mtjz3fwvonsH4gP2mSPApSNBx1S/Jp9vHpoorpb56l+RpDQrCGxc7YDYichzqjINtn6TCShIIIynb5/ERJ583w/1QGNPMhgQ17jbGbzSeEn1JkYgIZpGURkIcslI8GSTst3BWf91eN3mmpBHafZzHVc2smDEtVORH5KdaSWI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZrimDvJvfn9va/TXUC284STIRInjHjNFO28Ov7g0Egi+/1xLErRvlwbTzb5m+yzSQqJ0SFr49tmQbkqIL4tgHcOGyXLi3kv9ASj4zYIQApv1iFjKVLT3ROxq5oeYfqX2go4i2IEmJSo/H/fpv0W6YKwBXjSBRom10KXmXipG4EJzKVEykmvYg9vOpS0vMJi8kVEJRIUzM9j49GlDx08Tu11aW09yJRak/gcf1mnpMiugZ4Df4PcXy6mncX3YuGffR6sT5Qe8N3VqIouGXwypUtO/+f8vNqz8EP2sRSmtqQYEuPE8ADImXRz7ycTUMV2DhCeMhJSgtn5oyivgULJa1ewUgHppui7EaPlkL8a4hWg1AyN1spNmE4cOjhWkI55BporZYUh2OlELYUXwbpMqa7xeLtsHn0RLOPs3c0G22rNhMdbUpu7dKKsiUO7c6g9Qd+dqiQRxQn3Esznqr3eYa6FqkQtypTUZf4MY+FQKtwc1HK/yZXVDreb/SLMAidw6pr8CH0dQj8BRmuGq8s4GBKoKQtw8XY8dLO8Y1QeyOlOKs0T8rQQ5cjKbGKvMx69tR1nkM0BKy4EzNOuZDGATNHgIZgDIMKKpNeKqd5jGe6Bie5ZiWTtpzf2FvpBRmYFvwmvYgZFjK7p1JKWw9rrdulg33yfBdIt6hpnxVy2u9MmxazEVc31QDsBTTjTgElNS6ZihsKHaXJWvJ2/77TDFh4PFNVJA1mThBLEKQMkXS0+n3BU4xtLVTEdKgBzgnTwOw5N/Kmi3lvuBtKT+nme5fpd7F5MA4sCdV98RacPmZdEdoT3AzqRkwWxoma6pJjQBdGnqkomyKSkY9bldhTnP6pRsotJEfFpuE5ORO29eE9Vm7qw2R6VtgB/8x6jts+svp37iNC81FETyQZhac5ThiUzxDAt5nBWwHpzqP0EyiS0OlBPJGaxV2Ke1HKMDl60KZ7vTmTvq7GRWNuDh1MDD4LdwA22r1s4vGY+h8d9FEClLoZzWPVetaB0JqNkJVlGBLVlJtBu0hPHalnF/He/QcUzHj7qCKkzuUi1lHVR5N4g4UN3h8ASv4xoxhOuHnNoDd3AUCd9qhnhu+SvhjcMxkcakDmTzsPYhh23+E+uD36EO95kKTjKb0OKV2ZrVtyCdHgXuYnJuZRGWXaHoPg07fJ6jcrZN2o6SF6rkKfWBHQvU7bLr0jVX+xnF5eqhV6/CLA5JShvONRqmfhj2Z2ORWuFFo3vJ6rDJwovj2Z5AIpiJPwVPzSW2a+HBFNuTbETD0xRCotz0STpLN9a4UnVa5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc6a3b45-fe6f-4222-6810-08dc2a8c5c38 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2024 23:02:31.2911 (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: AS8P250MB0037 Subject: [FFmpeg-devel] [PATCH 30/35] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CvBNgF6ocSL1 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 c6f94bf0a8..193fafe61c 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,