Browse Source

Merge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Derek Buitenhuis 9 years ago
parent
commit
aa40df483b
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavfilter/vf_fade.c

+ 1
- 1
libavfilter/vf_fade.c View File

@@ -247,7 +247,7 @@ static int filter_slice_chroma(AVFilterContext *ctx, void *arg, int jobnr,
const int width = AV_CEIL_RSHIFT(frame->width, s->hsub);
const int height= AV_CEIL_RSHIFT(frame->height, s->vsub);
int slice_start = (height * jobnr ) / nb_jobs;
int slice_end = (height * (jobnr+1)) / nb_jobs;
int slice_end = FFMIN(((height * (jobnr+1)) / nb_jobs), frame->height);

for (plane = 1; plane < 3; plane++) {
for (i = slice_start; i < slice_end; i++) {


Loading…
Cancel
Save