summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/motion_est.c4
-rw-r--r--libavcodec/motion_est_template.c2
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