diff options
author | Loren Merritt <lorenm@u.washington.edu> | 2007-03-31 23:58:33 +0000 |
---|---|---|
committer | Loren Merritt <lorenm@u.washington.edu> | 2007-03-31 23:58:33 +0000 |
commit | 1cfe393a25d216354567ca237b372d3a01c2579a (patch) | |
tree | 34e61c28564482bf6bd19490131eaa3e7a15ff23 /libavcodec | |
parent | bb21f1762aee4a7f3890b0daf524a44e7db1c565 (diff) | |
download | ffmpeg-1cfe393a25d216354567ca237b372d3a01c2579a.tar.gz |
doxy comment tweaks
Originally committed as revision 8580 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/motion_est.c | 4 | ||||
-rw-r--r-- | libavcodec/motion_est_template.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index cb9731c3e2..a042f49166 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -103,8 +103,8 @@ static int get_flags(MotionEstContext *c, int direct, int chroma){ + (chroma ? FLAG_CHROMA : 0); } -/*! \brief compares two blocks, which may be full macroblocks or may be - partitions thereof. +/*! \brief compares a block (either a full macroblock or a partition thereof) + against a proposed motion-compensated prediction of that block */ static av_always_inline int cmp(MpegEncContext *s, const int x, const int y, const int subx, const int suby, const int size, const int h, int ref_index, int src_index, diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index e014250269..37443b0226 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -1004,7 +1004,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int MotionEstContext * const c= &s->me; int best[2]={0, 0}; /*!< x and y coordinates of the best motion vector. i.e. the difference between the position of the - block current being encoded and the position of + 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 |