diff options
| author | Uoti Urpala <uoti.urpala@pp1.inet.fi> | 2008-02-03 17:54:30 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-02-03 17:54:30 +0000 |
| commit | 4bdd3b76fee430d64ad2df343b47d0d0ea33c85b (patch) | |
| tree | cb3dff7e94f24b4abf546bffd6849513cee6978a /libavcodec | |
| parent | b313e8159c90db8cf60f9771e85186cf46074e8f (diff) | |
| download | ffmpeg-4bdd3b76fee430d64ad2df343b47d0d0ea33c85b.tar.gz | |
mpegvideo.h has two function declarations with the 'inline' specifier
but no definition for those functions. The C standard requires a
definition to appear in the same translation unit for any function
declared with 'inline'. Most of the files including mpegvideo.h do not
define those functions. Fix this by removing the 'inline' specifiers
from the header.
patch by Uoti Urpala
Originally committed as revision 11830 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index c54a4bab20..37c60ca573 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -771,10 +771,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, +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); -inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, +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 */ |