# HG changeset patch # User rathann # Date 1160341863 0 # Node ID 514c6726b83b507a42b67ba8ea338a0cd209ada3 # Parent f48a01a0d3dcea320144800e9f779462285e4dde 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. diff -r f48a01a0d3dc -r 514c6726b83b motion_est_template.c --- a/motion_est_template.c Sun Oct 08 14:32:27 2006 +0000 +++ b/motion_est_template.c Sun Oct 08 21:11:03 2006 +0000 @@ -233,7 +233,7 @@ 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 -r f48a01a0d3dc -r 514c6726b83b mpegvideo.h --- a/mpegvideo.h Sun Oct 08 14:32:27 2006 +0000 +++ b/mpegvideo.h Sun Oct 08 21:11:03 2006 +0000 @@ -774,7 +774,7 @@ 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 */