aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-07-08 10:22:13 +0200
committerAnton Khirnov <anton@khirnov.net>2023-08-30 11:53:50 +0200
commitbff48e8d693d4cf8fc3828937fbd9be8c1881b1d (patch)
tree8b501997d39641006ad5c1b4eb4728a9bcf151d5
parentd55262704e2c5c5a9a07d6b29ba74fa093d5320d (diff)
downloadffmpeg-bff48e8d693d4cf8fc3828937fbd9be8c1881b1d.tar.gz
fftools/ffmpeg_mux: rename of_close() to of_free()
This function is primarily a destructor for OutputFile, the underlying AVIOContext is normally closed earlier (right after writing the trailer).
-rw-r--r--fftools/ffmpeg.c3
-rw-r--r--fftools/ffmpeg.h2
-rw-r--r--fftools/ffmpeg_mux.c2
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 54410aac5c..e74b5f09f5 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -917,7 +917,7 @@ static void fc_close(AVFormatContext **pfc)
*pfc = NULL;
}
-void of_close(OutputFile **pof)
+void of_free(OutputFile **pof)
{
OutputFile *of = *pof;
Muxer *mux;