From ef8725122d23b7dfc23cb87b84267b78d90586ab Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 11 Jun 2014 22:08:15 +0200
Subject: [PATCH] avcodec/motion_est: Only clip MVs which are used
Fixes valgrind mpeg4 failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/motion_est.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 0500002eaa0..b093580e8fa 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -620,7 +620,11 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
P_MV1[0]= mx;
P_MV1[1]= my;
if(saftey_cliping)
- for(i=0; i<10; i++){
+ for(i=1; i<10; i++){
+ if (s->first_slice_line && block<2 && i>1 && i<9)
+ continue;
+ if (i>4 && i<9)
+ continue;
if(P[i][0] > (c->xmax<<shift)) P[i][0]= (c->xmax<<shift);
if(P[i][1] > (c->ymax<<shift)) P[i][1]= (c->ymax<<shift);
}
--
GitLab