diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-04-02 01:13:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-04-02 01:13:59 +0000 |
| commit | e056d2a24bb102a57debbd9fdfae4963ece1325e (patch) | |
| tree | 71c6748c08bff49b96c4412210d3ff94e34fc08e | |
| parent | 919e749772d09900b41877e21ccb994fab0013ab (diff) | |
| download | ffmpeg-e056d2a24bb102a57debbd9fdfae4963ece1325e.tar.gz | |
Move comment that belonged to cmp() back to cmp().
Originally committed as revision 22772 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/motion_est.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 43d4fbae36..01ba6c63a7 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -104,9 +104,6 @@ static int get_flags(MotionEstContext *c, int direct, int chroma){ + (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 *s, const int x, const int y, const int s } } +/*! \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){ |