Mercurial > libavcodec.hg
comparison mpegvideo.h @ 6323:e6da66f378c7 libavcodec
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
| author | diego |
|---|---|
| date | Sun, 03 Feb 2008 17:54:30 +0000 |
| parents | 83cb2494fb8a |
| children | e1dd408a7864 |
comparison
equal
deleted
inserted
replaced
| 6322:ec49b2361300 | 6323:e6da66f378c7 |
|---|---|
| 769 void ff_fix_long_p_mvs(MpegEncContext * s); | 769 void ff_fix_long_p_mvs(MpegEncContext * s); |
| 770 void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select, | 770 void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select, |
| 771 int16_t (*mv_table)[2], int f_code, int type, int truncate); | 771 int16_t (*mv_table)[2], int f_code, int type, int truncate); |
| 772 void ff_init_me(MpegEncContext *s); | 772 void ff_init_me(MpegEncContext *s); |
| 773 int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); | 773 int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); |
| 774 inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, | 774 int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, |
| 775 int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], | 775 int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], |
| 776 int ref_mv_scale, int size, int h); | 776 int ref_mv_scale, int size, int h); |
| 777 inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, | 777 int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, |
| 778 int ref_index, int size, int h, int add_rate); | 778 int ref_index, int size, int h, int add_rate); |
| 779 | 779 |
| 780 /* mpeg12.c */ | 780 /* mpeg12.c */ |
| 781 extern const uint16_t ff_mpeg1_default_intra_matrix[64]; | 781 extern const uint16_t ff_mpeg1_default_intra_matrix[64]; |
| 782 extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; | 782 extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; |