[FFmpeg-cvslog] r22772 - trunk/libavcodec/motion_est.c

michael subversion
Fri Apr 2 03:13:59 CEST 2010


Author: michael
Date: Fri Apr  2 03:13:59 2010
New Revision: 22772

Log:
Move comment that belonged to cmp() back to cmp().

Modified:
   trunk/libavcodec/motion_est.c

Modified: trunk/libavcodec/motion_est.c
==============================================================================
--- trunk/libavcodec/motion_est.c	Fri Apr  2 03:07:03 2010	(r22771)
+++ trunk/libavcodec/motion_est.c	Fri Apr  2 03:13:59 2010	(r22772)
@@ -104,9 +104,6 @@ static int get_flags(MotionEstContext *c
            + (chroma ? FLAG_CHROMA : 0);
 }
 
-/*! \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_direct_inline(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,
                       me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, int qpel){
@@ -251,6 +248,9 @@ static int cmp_internal(MpegEncContext *
     }
 }
 
+/*! \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,
                       me_cmp_func cmp_func, me_cmp_func chroma_cmp_func, const int flags){



More information about the ffmpeg-cvslog mailing list