summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-04-20 21:51:11 +0200
committerDiego Biurrun <diego@biurrun.de>2013-04-30 16:02:02 +0200
commit088f38a4f9f54bb923405c67c9e72d96d90aa284 (patch)
tree6ed1103be05c3bbb5a21705b87faad8b76f6a358 /libavcodec/motion_est.c
parent38282149b6ce8f4b8361e3b84542ba9aa8a1f32f (diff)
avcodec: Drop unnecessary ff_ name prefixes from static functions
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r--libavcodec/motion_est.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 91304c5377..04ae49ec48 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1104,8 +1104,8 @@ int ff_pre_estimate_p_frame_motion(MpegEncContext * s,
return dmin;
}
-static int ff_estimate_motion_b(MpegEncContext * s,
- int mb_x, int mb_y, int16_t (*mv_table)[2], int ref_index, int f_code)
+static int estimate_motion_b(MpegEncContext *s, int mb_x, int mb_y,
+ int16_t (*mv_table)[2], int ref_index, int f_code)
{
MotionEstContext * const c= &s->me;
int mx, my, dmin;
@@ -1522,10 +1522,12 @@ void ff_estimate_b_frame_motion(MpegEncContext * s,
dmin= INT_MAX;
//FIXME penalty stuff for non mpeg4
c->skip=0;
- fmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) + 3*penalty_factor;
+ fmin = estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) +
+ 3 * penalty_factor;
c->skip=0;
- bmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) + 2*penalty_factor;
+ bmin = estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) +
+ 2 * penalty_factor;
av_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
c->skip=0;