Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
J. Bohl Michael Niedermayer 13 years ago
parent
commit
0719e44b58
2 changed files with 10 additions and 2 deletions
  1. +2
    -2
      libavcodec/motion_est_template.c
  2. +8
    -0
      libavutil/attributes.h

+ 2
- 2
libavcodec/motion_est_template.c View File

@@ -162,7 +162,7 @@ static int no_sub_motion_search(MpegEncContext * s,
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)
{
// 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
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 ref_mv_scale, int size, int h)
{


+ 8
- 0
libavutil/attributes.h View File

@@ -40,6 +40,14 @@
#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
#if AV_GCC_VERSION_AT_LEAST(2,5)
# define av_noreturn __attribute__((noreturn))


Loading…
Cancel
Save