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 EB94F470B5 for ; Sat, 26 Aug 2023 15:15:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A772668C722; Sat, 26 Aug 2023 18:13:30 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 484C768C6C5 for ; Sat, 26 Aug 2023 18:13:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 873262401C1 for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Zw90_Bd_jmuO for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from mail1.khirnov.net (mail1.khirnov.net [IPv6:2a00:c500:561:206::5]) (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 "mail1.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2B25B240177 for ; Sat, 26 Aug 2023 17:13:11 +0200 (CEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 785F740FA for ; Sat, 26 Aug 2023 17:15:14 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 0VgABGNTWHSa for ; Sat, 26 Aug 2023 17:15:14 +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 mail1.khirnov.net (Postfix) with ESMTPS id 5FEDE4106 for ; Sat, 26 Aug 2023 17:15:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 014F63A1761 for ; Sat, 26 Aug 2023 17:11:53 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2023 17:11:43 +0200 Message-Id: <20230826151144.24858-17-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230826151144.24858-1-anton@khirnov.net> References: <20230826151144.24858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/18] fftools/ffmpeg_mux: rename of_close() to of_free() 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 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: This function is primarily a destructor for OutputFile, the underlying AVIOContext is normally closed earlier (right after writing the trailer). --- fftools/ffmpeg.c | 3 +-- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_mux.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8b0f31aac6..45844b489f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -362,9 +362,8 @@ static void ffmpeg_cleanup(int ret) fg_free(&filtergraphs[i]); av_freep(&filtergraphs); - /* close files */ for (i = 0; i < nb_output_files; i++) - of_close(&output_files[i]); + of_free(&output_files[i]); for (i = 0; i < nb_input_files; i++) ifile_close(&input_files[i]); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index ef5bb13908..9c85df5bdf 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -821,7 +821,7 @@ int enc_flush(void); int of_stream_init(OutputFile *of, OutputStream *ost); int of_write_trailer(OutputFile *of); int of_open(const OptionsContext *o, const char *filename); -void of_close(OutputFile **pof); +void of_free(OutputFile **pof); void of_enc_stats_close(void); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 076c6afabd..3d6309c3c0 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -908,7 +908,7 @@ static void fc_close(AVFormatContext **pfc) *pfc = NULL; } -void of_close(OutputFile **pof) +void of_free(OutputFile **pof) { OutputFile *of = *pof; Muxer *mux; -- 2.40.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".