diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-12-08 00:35:08 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-12-08 00:35:08 +0000 |
| commit | 849f10351d673ced1db6f13e399876f22121f60c (patch) | |
| tree | 779ae65e38d3070b7bf48ea6e6d89032a9e00521 /libavcodec/motion_est.c | |
| parent | fb17fac8c7dd92c77cf93019510e15fdae418d16 (diff) | |
rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 2c5705c2ba..fc057712d4 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -103,7 +103,7 @@ static int get_flags(MotionEstContext *c, int direct, int chroma){ + (chroma ? FLAG_CHROMA : 0); } -static always_inline int cmp(MpegEncContext *s, const int x, const int y, const int subx, const int suby, +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){ MotionEstContext * const c= &s->me; |