aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Himsley <mark@mdsh.com>2011-03-18 15:25:26 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-03-18 23:25:33 +0100
commit19d82cb14cc5967b8e09b242da1c2aa2d32be028 (patch)
tree744967f9542382a696170cfaa943e1931abe2072
parent1527e689cfe3d1f0062f7d3935bad6ed027b3bc8 (diff)
downloadffmpeg-19d82cb14cc5967b8e09b242da1c2aa2d32be028.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).
-rw-r--r--libavfilter/vf_fade.c2
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];