| Message ID | 20191007050617.93185-1-lq@chinaffmpeg.org |
|---|---|
| State | Superseded |
| Headers | show |
> 在 2019年10月7日，下午1:06，Steven Liu <lq@chinaffmpeg.org> 写道： > > because the interp >= 0UL comparison of an unsigned value is always true > fix CID: 1454642 > > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > --- > libavfilter/vf_delogo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c > index 376c5e850f..27a769982f 100644 > --- a/libavfilter/vf_delogo.c > +++ b/libavfilter/vf_delogo.c > @@ -168,7 +168,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, > botleft[x-logo_x1-1] + > botleft[x-logo_x1+1]) * weightb; > weight = (weightl + weightr + weightt + weightb) * 3U; > - interp = ROUNDED_DIV(interp, weight); > + interp += weight >> 1; > > if (y >= logo_y+band && y < logo_y+logo_h-band && > x >= logo_x+band && x < logo_x+logo_w-band) { > -- > 2.17.2 (Apple Git-113) > ignore this patch please, i will resubmit v2 > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 376c5e850f..27a769982f 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -168,7 +168,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, botleft[x-logo_x1-1] + botleft[x-logo_x1+1]) * weightb; weight = (weightl + weightr + weightt + weightb) * 3U; - interp = ROUNDED_DIV(interp, weight); + interp += weight >> 1; if (y >= logo_y+band && y < logo_y+logo_h-band && x >= logo_x+band && x < logo_x+logo_w-band) {
because the interp >= 0UL comparison of an unsigned value is always true fix CID: 1454642 Signed-off-by: Steven Liu <lq@chinaffmpeg.org> --- libavfilter/vf_delogo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)