highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_mux: rename of_close() to of_free()

Browse Source 
This function is primarily a destructor for OutputFile, the underlying
AVIOContext is normally closed earlier (right after writing the
trailer).
This commit is contained in:
Anton Khirnov 2023-07-08 10:22:13 +02:00
parent d55262704e
commit bff48e8d69
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.c
View File

@ -362,9 +362,8 @@ static void ffmpeg_cleanup(int ret)
fg_free(&filtergraphs[i]); fg_free(&filtergraphs[i]);
av_freep(&filtergraphs); av_freep(&filtergraphs);
/* close files */
for (i = 0; i < nb_output_files; i++) 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++) for (i = 0; i < nb_input_files; i++)
ifile_close(&input_files[i]); ifile_close(&input_files[i]);

2
fftools/ffmpeg.h
View File

@ -821,7 +821,7 @@ int enc_flush(void);
int of_stream_init(OutputFile *of, OutputStream *ost); int of_stream_init(OutputFile *of, OutputStream *ost);
int of_write_trailer(OutputFile *of); int of_write_trailer(OutputFile *of);
int of_open(const OptionsContext *o, const char *filename); 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); void of_enc_stats_close(void);

2
fftools/ffmpeg_mux.c
View File

@ -917,7 +917,7 @@ static void fc_close(AVFormatContext **pfc)
*pfc = NULL; *pfc = NULL;
} }
void of_close(OutputFile **pof) void of_free(OutputFile **pof)
{ {
OutputFile *of = *pof; OutputFile *of = *pof;
Muxer *mux; Muxer *mux;