From patchwork Thu Oct 13 13:49:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp349341pzb; Thu, 13 Oct 2022 06:50:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Hol8IjggNQNaQw/lAweHUvr8YeLQFxO+7Jhuvnp6IO7bnlzmMBh31+T103Y+zsLuxDcpk X-Received: by 2002:aa7:c58a:0:b0:459:1511:6cff with SMTP id g10-20020aa7c58a000000b0045915116cffmr32384638edq.27.1665669058353; Thu, 13 Oct 2022 06:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665669058; cv=none; d=google.com; s=arc-20160816; b=u+U9mYLdhV2V21kkeqCJ+WKwl00BgXQishx9gvG5s7SGfaCLjh+1HdKi2PiAgTrH1J zz5I2UqWlG2lbDU5LUZ9iNGBsqZuyce+38Y151jTa85SMSMZAkB0qIdlw2e1q3S1PFsh TN7Zh306cGmu0dJMBr+4UTiqRILJHbKD3CQKjRiPorw9ZdF2EpjNMh/7M9vAhL41i6LD I3utewgGjoUFW7CFhdv3enf3XyS6NcRG214FOa+IaTM4EOrQE5yzbc+JIqy5Vzckv//m zhH/7GtpIscFKpwqp4kOLewiW3sSp96PaGkZKG+1ZdX0zuj6+6NNLJGmZ8BpsfHv/cxi DWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=fpgJi4sVKx1KFVXj6Alkdl8JomCj6+jiiGC78A1h/S8=; b=Yy+AIZDBTQJziR9aqdy3HeZTvFOfmba1de38PQytPowCNltQ4wqv+VpW5ZFeytsCc5 jcsmSBOs2/GE21SQAZYGoybG0zvVrCHiIQJU8M8SYIyq89R4MhkIrazsNv0XAXXn0OFF rM79Yw4kLXrtSYiXHZUYVaH/Qtjx0bxycZbpsOEgqmtFiKnroLx5asXYudb64uTbxkoF uWG9XP2rkIACo/pciJwaLfqK1IqUc3N7n8i/JeO7LNoepKPnZYMmenQ3PacpMGuplYL1 fIGHAMqc5/Bmzn9+fCiiSLY6QlOYIE72JZNS0Bq90St4oocGmRDJyQPWf0TiVIH5bOPw b4rw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fj3-20020a1709069c8300b0078d9cec6a5asi17089164ejc.191.2022.10.13.06.50.58; Thu, 13 Oct 2022 06:50: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C913F68BD94; Thu, 13 Oct 2022 16:49:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FB6C68BD6C for ; Thu, 13 Oct 2022 16:49:19 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2D20E2406CA for ; Thu, 13 Oct 2022 15:49:17 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id pYlfv6F6YTOW for ; Thu, 13 Oct 2022 15:49:16 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 69BCB2406C7 for ; Thu, 13 Oct 2022 15:49:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 30BDA3A18F7 for ; Thu, 13 Oct 2022 15:49:08 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Oct 2022 15:49:02 +0200 Message-Id: <20221013134904.10104-11-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013134904.10104-1-anton@khirnov.net> References: <20221013134904.10104-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/13] fftools/ffmpeg_mux: inline mux_free() into of_close() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GhkBzs08HPbt mux_free() is no longer called from anywhere else. --- fftools/ffmpeg_mux.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 2f71e03144..f830e5854b 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -599,8 +599,20 @@ static void fc_close(AVFormatContext **pfc) *pfc = NULL; } -static void mux_free(Muxer *mux) +void of_close(OutputFile **pof) { + OutputFile *of = *pof; + Muxer *mux; + + if (!of) + return; + mux = mux_from_of(of); + + thread_stop(mux); + + sq_free(&of->sq_encode); + sq_free(&of->sq_mux); + for (int i = 0; i < mux->of.nb_streams; i++) { MuxStream *ms = &mux->streams[i]; AVPacket *pkt; @@ -618,23 +630,6 @@ static void mux_free(Muxer *mux) av_packet_free(&mux->sq_pkt); fc_close(&mux->fc); -} - -void of_close(OutputFile **pof) -{ - OutputFile *of = *pof; - Muxer *mux; - - if (!of) - return; - mux = mux_from_of(of); - - thread_stop(mux); - - sq_free(&of->sq_encode); - sq_free(&of->sq_mux); - - mux_free(mux_from_of(of)); av_freep(pof); }