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

diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index a3ea4f4951bf2f94619d9b9490b37041f0f32675..47454c5fd2649c3af0dfef2941663df7f769f1aa 100644 (file)
--- 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 0cfbb736e39ba1a3beef69e9314934ec08dd6629..f4866dd34c6d7791a64d02ba974f128bba414b10 100644 (file)
--- 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 */