virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

fftools/ffmpeg: remove a cleanup block at the end of transcode()

Browse Source 
Some of it is already duplicated in ost_free() - those parts can be just
dropped. The rest is moved to ost_free(), as it properly belongs there.
This commit is contained in:
Anton Khirnov 2022-10-14 11:09:42 +02:00
parent 7ef7a22251
commit fe304c0694
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fftools/ffmpeg.c
View File

@ -509,6 +509,14 @@ static void ost_free(OutputStream **post)
if (!ost) if (!ost)
return; return;
if (ost->logfile) {
if (fclose(ost->logfile))
av_log(NULL, AV_LOG_ERROR,
"Error closing logfile, loss of information possible: %s\n",
av_err2str(AVERROR(errno)));
ost->logfile = NULL;
}
av_bsf_free(&ost->bsf_ctx); av_bsf_free(&ost->bsf_ctx);
av_frame_free(&ost->filtered_frame); av_frame_free(&ost->filtered_frame);
@ -521,6 +529,9 @@ static void ost_free(OutputStream **post)
av_expr_free(ost->forced_keyframes_pexpr); av_expr_free(ost->forced_keyframes_pexpr);
av_freep(&ost->avfilter); av_freep(&ost->avfilter);
av_freep(&ost->logfile_prefix); av_freep(&ost->logfile_prefix);
av_freep(&ost->forced_kf_pts);
av_freep(&ost->apad);
av_freep(&ost->disposition);
#if FFMPEG_OPT_MAP_CHANNEL #if FFMPEG_OPT_MAP_CHANNEL
av_freep(&ost->audio_channels_map); av_freep(&ost->audio_channels_map);
@ -4033,24 +4044,6 @@ static int transcode(void)
fail: fail:
free_input_threads(); free_input_threads();
for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) {
if (ost) {
if (ost->logfile) {
if (fclose(ost->logfile))
av_log(NULL, AV_LOG_ERROR,
"Error closing logfile, loss of information possible: %s\n",
av_err2str(AVERROR(errno)));
ost->logfile = NULL;
}
av_freep(&ost->forced_kf_pts);
av_freep(&ost->apad);
av_freep(&ost->disposition);
av_dict_free(&ost->encoder_opts);
av_dict_free(&ost->sws_dict);
av_dict_free(&ost->swr_opts);
}
}
return ret; return ret;
} }