From b0d170eb3a036c48bbfc89e4b087684895d279ac Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 14 May 2005 23:34:58 +0000 Subject: Compile fixes for gcc >= 3.4. * Move some static inlined functions so that they're defined, rather than just declared, before use. * Replace inline with __inline__ for some extern inlined functions (due to inline possibly being redefined to include the always_inline attribute). CVS patchset: 7541 CVS date: 2005/05/14 23:34:58 --- src/libffmpeg/libavcodec/mpegvideo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libffmpeg/libavcodec/mpegvideo.h') diff --git a/src/libffmpeg/libavcodec/mpegvideo.h b/src/libffmpeg/libavcodec/mpegvideo.h index df67a469c..f5db85952 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.h +++ b/src/libffmpeg/libavcodec/mpegvideo.h @@ -810,10 +810,10 @@ void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_ int16_t (*mv_table)[2], int f_code, int type, int truncate); void ff_init_me(MpegEncContext *s); 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, +extern __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, +extern __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 */ -- cgit v1.2.3