RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-09 16:19:35 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_dedot: fix crash

Browse Source 
Fixes #8299
This commit is contained in:
Paul B Mahol 2019-10-17 11:51:22 +02:00
parent ce40188bc0
commit 8f63c4e72a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_dedot.c
View File

@ -283,7 +283,7 @@ static int activate(AVFilterContext *ctx)
s->frames[i] = av_frame_clone(frame); s->frames[i] = av_frame_clone(frame);
} }
av_frame_free(&frame); av_frame_free(&frame);
} else { } else if (s->frames[3]) {
s->eof_frames--; s->eof_frames--;
s->frames[4] = av_frame_clone(s->frames[3]); s->frames[4] = av_frame_clone(s->frames[3]);
} }
@ -343,7 +343,11 @@ static int activate(AVFilterContext *ctx)
if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) { if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) {
if (status == AVERROR_EOF) { if (status == AVERROR_EOF) {
s->eof = 1; s->eof = 1;
s->eof_frames = 2; s->eof_frames = !!s->frames[0] + !!s->frames[1];
if (s->eof_frames <= 0) {
ff_outlink_set_status(outlink, AVERROR_EOF, pts);
return 0;
}
ff_filter_set_ready(ctx, 10); ff_filter_set_ready(ctx, 10);
return 0; return 0;
} }