[FFmpeg-cvslog] avfilter/vf_delogo: make the interp value compute method simple

Steven Liu git at videolan.org
Thu Oct 10 05:27:23 EEST 2019


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Tue Oct  8 11:45:33 2019 +0800| [a76a516e761ae950d2f5ccd4469ea8d3416718f2] | committer: Steven Liu

avfilter/vf_delogo: make the interp value compute method simple

because the interp >= 0UL comparison of an unsigned value is always true
fix CID: 1454642

Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a76a516e761ae950d2f5ccd4469ea8d3416718f2
---

 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 9c58418e11..a5692b0c62 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 = (interp + (weight >> 1)) / weight;
 
             if (y >= logo_y+band && y < logo_y+logo_h-band &&
                 x >= logo_x+band && x < logo_x+logo_w-band) {



More information about the ffmpeg-cvslog mailing list