apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 20:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg: close output files before cleanup

Browse Source 
This allows us to check the return value of avio_closep().

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2021-11-30 01:18:14 +01:00
parent 8a40cfa4da
commit 8d66a07d65
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fftools/ffmpeg.c
View File

@@ -4699,7 +4699,7 @@ static int transcode(void)
term_exit(); term_exit();
/* write the trailer if needed and close file */ /* write the trailer if needed */
for (i = 0; i < nb_output_files; i++) { for (i = 0; i < nb_output_files; i++) {
os = output_files[i]->ctx; os = output_files[i]->ctx;
if (!output_files[i]->header_written) { if (!output_files[i]->header_written) {
@@ -4719,6 +4719,18 @@ static int transcode(void)
/* dump report by using the first video and audio streams */ /* dump report by using the first video and audio streams */
print_report(1, timer_start, av_gettime_relative()); print_report(1, timer_start, av_gettime_relative());
/* close the output files */
for (i = 0; i < nb_output_files; i++) {
os = output_files[i]->ctx;
if (os && os->oformat && !(os->oformat->flags & AVFMT_NOFILE)) {
if ((ret = avio_closep(&os->pb)) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error closing file %s: %s\n", os->url, av_err2str(ret));
if (exit_on_error)
exit_program(1);
}
}
}
/* close each encoder */ /* close each encoder */
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
ost = output_streams[i]; ost = output_streams[i];