diff options
| author | Mark Himsley <mark@mdsh.com> | 2011-03-18 15:25:26 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-25 22:45:44 +0200 |
| commit | b04d1abb40d32d8d08df39733e1b04a8a2f814ab (patch) | |
| tree | 26967798d1503d17dfbc3fe3260ea6bd583ef4cb /libavfilter | |
| parent | 9026b27e84f6cf6b0133d7aab5b874500bcc5313 (diff) | |
| download | ffmpeg-b04d1abb40d32d8d08df39733e1b04a8a2f814ab.tar.gz | |
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).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 4c2cd4b38a..0c8668ce90 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]; |