diff options
| author | Marton Balint <cus@passwd.hu> | 2019-01-06 14:26:11 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2019-01-28 21:46:58 +0100 |
| commit | 483d02918872fb382e7d630b9ef5b2551283c2f4 (patch) | |
| tree | 62d05421e8361f01624c1f4311a1ff4403b404a1 /libavcodec/motion_est.c | |
| parent | 1db30d6cec70d9b28c80cb743220dd2502b8df30 (diff) | |
| download | ffmpeg-483d02918872fb382e7d630b9ef5b2551283c2f4.tar.gz | |
avcodec/motion_est: remove duplicate function
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 8b5ce2117a..759eea479d 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -633,7 +633,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) if(P[i][1] > (c->ymax<<shift)) P[i][1]= (c->ymax<<shift); } - dmin4 = epzs_motion_search4(s, &mx4, &my4, P, block, block, s->p_mv_table, (1<<16)>>shift); + dmin4 = epzs_motion_search2(s, &mx4, &my4, P, block, block, s->p_mv_table, (1<<16)>>shift, 1); dmin4= c->sub_motion_search(s, &mx4, &my4, dmin4, block, block, size, h); @@ -795,7 +795,7 @@ static int interlaced_search(MpegEncContext *s, int ref_index, P_MV1[0]= mx; //FIXME not correct if block != field_select P_MV1[1]= my / 2; - dmin = epzs_motion_search2(s, &mx_i, &my_i, P, block, field_select+ref_index, mv_table, (1<<16)>>1); + dmin = epzs_motion_search2(s, &mx_i, &my_i, P, block, field_select+ref_index, mv_table, (1<<16)>>1, 0); dmin= c->sub_motion_search(s, &mx_i, &my_i, dmin, block, field_select+ref_index, size, h); |