diff options
author | Paul B Mahol <onemda@gmail.com> | 2019-10-17 11:51:22 +0200 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2019-10-17 11:51:22 +0200 |
commit | 8f63c4e72a8c2ccf71b566e8f41fb66bee28a52d (patch) | |
tree | 9f13fc2c60e1f5d2a3b249f510b75b8a7e3c8f7b | |
parent | ce40188bc046cd180e6f105a6c2d173877e3bcb7 (diff) | |
download | ffmpeg-8f63c4e72a8c2ccf71b566e8f41fb66bee28a52d.tar.gz |
avfilter/vf_dedot: fix crash
Fixes #8299
-rw-r--r-- | libavfilter/vf_dedot.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavfilter/vf_dedot.c b/libavfilter/vf_dedot.c index bb0f9e5ac8..ae5ef8f169 100644 --- a/libavfilter/vf_dedot.c +++ b/libavfilter/vf_dedot.c @@ -283,7 +283,7 @@ static int activate(AVFilterContext *ctx) s->frames[i] = av_frame_clone(frame); } av_frame_free(&frame); - } else { + } else if (s->frames[3]) { s->eof_frames--; 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 (status == AVERROR_EOF) { 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); return 0; } |