har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new attribute "extern inline" (fixing linker error with ff_get_mb_score and ff_get_mb_score)

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
J. Bohl 2012-06-14 23:09:52 +02:00 committed by Michael Niedermayer
parent 62c2daab0d
commit 0719e44b58
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/motion_est_template.c
View File

@ -162,7 +162,7 @@ static int no_sub_motion_search(MpegEncContext * s,
return dmin; return dmin;
} }
inline int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, av_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) int ref_index, int size, int h, int add_rate)
{ {
// const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp; // const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp;
@ -974,7 +974,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int
} }
//this function is dedicated to the braindamaged gcc //this function is dedicated to the braindamaged gcc
inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, av_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 P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2],
int ref_mv_scale, int size, int h) int ref_mv_scale, int size, int h)
{ {

8
libavutil/attributes.h
View File

@ -40,6 +40,14 @@
#endif #endif
#endif #endif
#ifndef av_extern_inline
#if defined(__INTEL_COMPILER) || defined(__GNUC_STDC_INLINE__)
# define av_extern_inline extern inline
#else
# define av_extern_inline inline
#endif
#endif
#ifndef av_noreturn #ifndef av_noreturn
#if AV_GCC_VERSION_AT_LEAST(2,5) #if AV_GCC_VERSION_AT_LEAST(2,5)
# define av_noreturn __attribute__((noreturn)) # define av_noreturn __attribute__((noreturn))