summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/motion_est_template.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2006-08-02 07:02:37 +0000
committerMike Melanson <mike@multimedia.cx>2006-08-02 07:02:37 +0000
commit5f24c84bddd59e2d1744408f2c3694050d7d3d3d (patch)
tree044d31ff791ca6d0d60b5624bd31554f7da53876 /src/libffmpeg/libavcodec/motion_est_template.c
parentfeaf0357aaa9f80562900ad9c50b9adf44d9b795 (diff)
downloadxine-lib-5f24c84bddd59e2d1744408f2c3694050d7d3d3d.tar.gz
xine-lib-5f24c84bddd59e2d1744408f2c3694050d7d3d3d.tar.bz2
sync to FFmpeg 51.11.0
CVS patchset: 8146 CVS date: 2006/08/02 07:02:37
Diffstat (limited to 'src/libffmpeg/libavcodec/motion_est_template.c')
-rw-r--r--src/libffmpeg/libavcodec/motion_est_template.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libffmpeg/libavcodec/motion_est_template.c b/src/libffmpeg/libavcodec/motion_est_template.c
index 23ead283c..16d34bb88 100644
--- a/src/libffmpeg/libavcodec/motion_est_template.c
+++ b/src/libffmpeg/libavcodec/motion_est_template.c
@@ -896,7 +896,8 @@ static always_inline int epzs_motion_search_internal(MpegEncContext * s, int *mx
CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16,
(last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16)
}else{
- if(dmin<h*h && ( P_LEFT[0] |P_LEFT[1]
+ if(dmin<((h*h*s->avctx->mv0_threshold)>>8)
+ && ( P_LEFT[0] |P_LEFT[1]
|P_TOP[0] |P_TOP[1]
|P_TOPRIGHT[0]|P_TOPRIGHT[1])==0){
*mx_ptr= 0;