Skip to content

F
ffmpeg
Commit 36393434 authored by Anshul Maheshwari's avatar Anshul Maheshwari Committed by Michael Niedermayer
Browse files
Options

ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 97578f5f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
ffmpeg.c
View file @ 36393434
...@@ -805,6 +805,8 @@ static void do_subtitle_out(AVFormatContext *s, ...@@ -805,6 +805,8 @@ static void do_subtitle_out(AVFormatContext *s,
if (output_files[ost->file_index]->start_time != AV_NOPTS_VALUE) if (output_files[ost->file_index]->start_time != AV_NOPTS_VALUE)
pts -= output_files[ost->file_index]->start_time; pts -= output_files[ost->file_index]->start_time;
for (i = 0; i < nb; i++) { for (i = 0; i < nb; i++) {
unsigned save_num_rects = sub->num_rects;
ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base); ost->sync_opts = av_rescale_q(pts, AV_TIME_BASE_Q, enc->time_base);
if (!check_recording_time(ost)) if (!check_recording_time(ost))
return; return;
...@@ -821,6 +823,8 @@ static void do_subtitle_out(AVFormatContext *s, ...@@ -821,6 +823,8 @@ static void do_subtitle_out(AVFormatContext *s,
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub); subtitle_out_max_size, sub);
if (i == 1)
sub->num_rects = save_num_rects;
if (subtitle_out_size < 0) { if (subtitle_out_size < 0) {
av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n"); av_log(NULL, AV_LOG_FATAL, "Subtitle encoding failed\n");
exit_program(1); exit_program(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment