virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg: move freeing 2pass input stats to a better place

Browse Source 
The current placement of this free is historical - it used to be
followed by avcodec_close(), since removed.

The proper place for freeing the stats is currently right before the
encoder context itself is freed.
This commit is contained in:
Anton Khirnov
2022-05-09 12:58:08 +02:00
parent 52fee96ae9
commit dceccd4aeb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fftools/ffmpeg.c
View File

@@ -588,6 +588,8 @@ static void ffmpeg_cleanup(int ret)
av_dict_free(&ost->sws_dict); av_dict_free(&ost->sws_dict);
av_dict_free(&ost->swr_opts); av_dict_free(&ost->swr_opts);
if (ost->enc_ctx)
av_freep(&ost->enc_ctx->stats_in);
avcodec_free_context(&ost->enc_ctx); avcodec_free_context(&ost->enc_ctx);
avcodec_parameters_free(&ost->ref_par); avcodec_parameters_free(&ost->ref_par);
@@ -4359,9 +4361,6 @@ static int transcode(void)
/* 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];
if (ost->encoding_needed) {
av_freep(&ost->enc_ctx->stats_in);
}
total_packets_written += ost->packets_written; total_packets_written += ost->packets_written;
if (!ost->packets_written && (abort_on_flags & ABORT_ON_FLAG_EMPTY_OUTPUT_STREAM)) { if (!ost->packets_written && (abort_on_flags & ABORT_ON_FLAG_EMPTY_OUTPUT_STREAM)) {
av_log(NULL, AV_LOG_FATAL, "Empty output on stream %d.\n", i); av_log(NULL, AV_LOG_FATAL, "Empty output on stream %d.\n", i);