From a638e9184d63e57e67901f34afe919fd56fd3ac4 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 24 Mar 2016 21:38:54 +0100 Subject: vf_fade: make sure the slice end is always in the frame CC: libav-stable@libav.org --- libavfilter/vf_fade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index eac0c2c9a9..eb6d82a894 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -123,7 +123,7 @@ static int filter_slice_chroma(AVFilterContext *ctx, void *arg, int jobnr, AVFrame *frame = arg; int slice_h = FFALIGN(frame->height / nb_jobs, 1 << s->vsub); int slice_start = jobnr * slice_h; - int slice_end = (jobnr == nb_jobs - 1) ? frame->height : (jobnr + 1) * slice_h; + int slice_end = FFMIN((jobnr + 1) * slice_h, frame->height); int i, j, plane; for (plane = 1; plane < 3; plane++) { -- cgit v1.2.3