diff options
| author | Mark Himsley <mark@mdsh.com> | 2011-03-18 18:25:26 +0300 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-03-19 01:25:33 +0300 |
| commit | 19d82cb14cc5967b8e09b242da1c2aa2d32be028 (patch) | |
| tree | 744967f9542382a696170cfaa943e1931abe2072 /libavfilter | |
| parent | 1527e689cfe3d1f0062f7d3935bad6ed027b3bc8 (diff) | |
fade: fix draw_slice() check on fade->factor value
draw_slice() checks that the fade factor is < 65536 and only
calculates the fade if so. But the fade factor is clipped in
end_frame() by av_clip_uint16() to 65535, so the fade is calculated
for every frame. This patch alters the check so that it compares with
< 65535 (UINT16_MAX).
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_fade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index 4a8f6172f0..28179a3da4 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -101,7 +101,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) uint8_t *p; int i, j, plane; - if (fade->factor < 65536) { + if (fade->factor < UINT16_MAX) { /* luma or rgb plane */ for (i = 0; i < h; i++) { p = outpic->data[0] + (y+i) * outpic->linesize[0]; |