diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-05-14 23:34:58 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2005-05-14 23:34:58 +0000 |
| commit | b0d170eb3a036c48bbfc89e4b087684895d279ac (patch) | |
| tree | 18cf6ace54e8a2a4442ef5ba83d92757887f4a24 /src/libffmpeg/libavcodec/mpegvideo.h | |
| parent | 2429be34b4fb386ab17935c0edab3cfc217c6c1f (diff) | |
| download | xine-lib-b0d170eb3a036c48bbfc89e4b087684895d279ac.tar.gz xine-lib-b0d170eb3a036c48bbfc89e4b087684895d279ac.tar.bz2 | |
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
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |