Mercurial > libavcodec.hg
changeset 11574:7b86b341edd0 libavcodec
Move comment that belonged to cmp() back to cmp().
| author | michael |
|---|---|
| date | Fri, 02 Apr 2010 01:13:59 +0000 |
| parents | a734f92c94b4 |
| children | 5a7797213359 |
| files | motion_est.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/motion_est.c Fri Apr 02 01:07:03 2010 +0000 +++ b/motion_est.c Fri Apr 02 01:13:59 2010 +0000 @@ -104,9 +104,6 @@ + (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 @@ } } +/*! \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){