From 621d92940efc196bad203da5f9a402cb4401f324 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 8 Oct 2006 21:11:03 +0000 Subject: [PATCH] =?UTF-8?q?Fixes:=20mpegvideo.h:777:=20warning:=20?= =?UTF-8?q?=E2=80=98inline=E2=80=99=20is=20not=20at=20beginning=20of=20dec?= =?UTF-8?q?laration=20motion=5Fest=5Ftemplate.c:236:=20warning:=20?= =?UTF-8?q?=E2=80=98inline=E2=80=99=20is=20not=20at=20beginning=20of=20dec?= =?UTF-8?q?laration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Approved by Diego. Originally committed as revision 6591 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/motion_est_template.c | 2 +- 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 */