Message ID | 20230826151144.24858-17-anton@khirnov.net |
---|---|
State | Accepted |
Commit | bff48e8d693d4cf8fc3828937fbd9be8c1881b1d |
Headers | show |
Series | [FFmpeg-devel,01/18] fftools/ffmpeg: stop explicitly closing output streams on input EOF | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
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;