[FFmpeg-cvslog] avfilter/vf_find_rect: Increase worst case score
Michael Niedermayer
git at videolan.org
Fri Apr 24 02:13:16 EEST 2020
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sun Jan 26 20:45:06 2020 +0100| [db8487611bc444e31e76221c165e9cca558138db] | committer: Michael Niedermayer
avfilter/vf_find_rect: Increase worst case score
score could be 1.0 which lead to uninitialized values
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6ff2474e02200dce7abdea3fd211fcaf49691c2c)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db8487611bc444e31e76221c165e9cca558138db
---
libavfilter/vf_find_rect.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c
index cb79f4a4ca..1a0e702583 100644
--- a/libavfilter/vf_find_rect.c
+++ b/libavfilter/vf_find_rect.c
@@ -159,7 +159,7 @@ static float search(FOCContext *foc, int pass, int maxpass, int xmin, int xmax,
if (pass + 1 <= maxpass) {
int sub_x, sub_y;
- search(foc, pass+1, maxpass, xmin>>1, (xmax+1)>>1, ymin>>1, (ymax+1)>>1, &sub_x, &sub_y, 1.0);
+ search(foc, pass+1, maxpass, xmin>>1, (xmax+1)>>1, ymin>>1, (ymax+1)>>1, &sub_x, &sub_y, 2.0);
xmin = FFMAX(xmin, 2*sub_x - 4);
xmax = FFMIN(xmax, 2*sub_x + 4);
ymin = FFMAX(ymin, 2*sub_y - 4);
@@ -198,7 +198,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
FFMIN(foc->xmax, foc->last_x + 8),
FFMAX(foc->ymin, foc->last_y - 8),
FFMIN(foc->ymax, foc->last_y + 8),
- &best_x, &best_y, 1.0);
+ &best_x, &best_y, 2.0);
best_score = search(foc, 0, foc->mipmaps - 1, foc->xmin, foc->xmax, foc->ymin, foc->ymax,
&best_x, &best_y, best_score);
More information about the ffmpeg-cvslog
mailing list