diff options
| author | Dominik Mierzejewski <dominik@rangers.eu.org> | 2006-10-08 21:11:03 +0000 |
|---|---|---|
| committer | Dominik Mierzejewski <dominik@rangers.eu.org> | 2006-10-08 21:11:03 +0000 |
| commit | 621d92940efc196bad203da5f9a402cb4401f324 (patch) | |
| tree | 08f23cd216f25436a8d3bac8b0af39ab2637fd40 /libavcodec | |
| parent | 214019ed3238f020757bdcff7bbb0cbd61e77a12 (diff) | |
| download | ffmpeg-621d92940efc196bad203da5f9a402cb4401f324.tar.gz | |
Fixes:
mpegvideo.h:777: warning: ‘inline’ is not at beginning of declaration
motion_est_template.c:236: warning: ‘inline’ is not at beginning of declaration
Approved by Diego.
Originally committed as revision 6591 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/motion_est_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index a3ea4f4951..47454c5fd2 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -233,7 +233,7 @@ static int no_sub_motion_search(MpegEncContext * s, return dmin; } -int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, +inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, int ref_index, int size, int h, int add_rate) { // const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 0cfbb736e3..f4866dd34c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -774,7 +774,7 @@ int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], int ref_mv_scale, int size, int h); -int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, +inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, int ref_index, int size, int h, int add_rate); /* mpeg12.c */ |