aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/motion_est_template.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-06-23 22:41:54 +0200
committerDiego Biurrun <diego@biurrun.de>2011-06-24 00:37:49 +0200
commitadbfc605f6bbe87b292c82cd1f5d4d974fa6b73c (patch)
treeb31a5510ae7872008d723771fc2af2f098f3fc0c /libavcodec/motion_est_template.c
parent9abbe8cc136e7fbc69004df3f1de9d54c40d969d (diff)
downloadffmpeg-adbfc605f6bbe87b292c82cd1f5d4d974fa6b73c.tar.gz
doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/motion_est_template.c')
-rw-r--r--libavcodec/motion_est_template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 6b807dc6f6..b451c76bb4 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -990,8 +990,8 @@ static av_always_inline int diamond_search(MpegEncContext * s, int *best, int dm
return var_diamond_search(s, best, dmin, src_index, ref_index, penalty_factor, size, h, flags);
}
-/*!
- \param P[10][2] a list of candidate mvs to check before starting the
+/**
+ @param P[10][2] a list of candidate mvs to check before starting the
iterative search. If one of the candidates is close to the optimal mv, then
it takes fewer iterations. And it increases the chance that we find the
optimal mv.
@@ -1001,12 +1001,12 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int
int ref_mv_scale, int flags, int size, int h)
{
MotionEstContext * const c= &s->me;
- int best[2]={0, 0}; /*!< x and y coordinates of the best motion vector.
+ int best[2]={0, 0}; /**< x and y coordinates of the best motion vector.
i.e. the difference between the position of the
block currently being encoded and the position of
the block chosen to predict it from. */
int d; ///< the score (cmp + penalty) of any given mv
- int dmin; /*!< the best value of d, i.e. the score
+ int dmin; /**< the best value of d, i.e. the score
corresponding to the mv stored in best[]. */
int map_generation;
int penalty_factor;