History

Merge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'

* commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4': vf_fade: make sure the slice end is always in the frame

Derek Buitenhuis committed 10 years ago

Commit aa40df42 parents 5f587b1 a638e911 file · +1 −1Browse files

Unified · Split

libavfilter/vf_fade.c+1−1
@@ -247,7 +247,7 @@ static int filter_slice_chroma(AVFilterContext *ctx, void *arg, int jobnr, · 246 unmodified lines
247247 const int width = AV_CEIL_RSHIFT(frame->width, s->hsub);
248248 const int height= AV_CEIL_RSHIFT(frame->height, s->vsub);
249249 int slice_start = (height * jobnr ) / nb_jobs;
250− int slice_end = (height * (jobnr+1)) / nb_jobs;
250+ int slice_end = FFMIN(((height * (jobnr+1)) / nb_jobs), frame->height);
251251
252252 for (plane = 1; plane < 3; plane++) {
253253 for (i = slice_start; i < slice_end; i++) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t