diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-02-21 14:04:40 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-02-23 11:47:54 +0100 |
| commit | 257b30af8ec520c1635092e429606c62d3bcca63 (patch) | |
| tree | 5932503fa2da91ef78f6e50e09575ced7cc81fc9 /libavcodec/x86 | |
| parent | cd846b47977485bd4063e77a3324e6b7840567a2 (diff) | |
| download | ffmpeg-257b30af8ec520c1635092e429606c62d3bcca63.tar.gz | |
x86: hevc: Fix linking with both yasm and optimizations disabled
Some optimized functions reference optimized symbols, so the functions
must be explicitly disabled when those symbols are unavailable.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/hevcdsp_init.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index d0c17769b7..fd22fc3c1a 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -86,7 +86,7 @@ INTERP_HV_FUNC(32, avx) INTERP_HV_FUNC(48, avx) INTERP_HV_FUNC(64, avx) -#if ARCH_X86_64 +#if ARCH_X86_64 && HAVE_AVX_EXTERNAL #define QPEL_FUNC_HV(width, depth, cf_h, cf_v, cf_hv) \ static void hevc_qpel_hv_ ## width ## _ ## depth ## _ ## cf_hv(int16_t *dst, ptrdiff_t dststride, \ uint8_t *src, ptrdiff_t srcstride, \ @@ -100,7 +100,7 @@ static void hevc_qpel_hv_ ## width ## _ ## depth ## _ ## cf_hv(int16_t *dst, ptr } #else #define QPEL_FUNC_HV(width, depth, cf_h, cf_v, cf_hv) -#endif +#endif /* ARCH_X86_64 && HAVE_AVX_EXTERNAL */ #define QPEL_FUNCS(width, depth, cf_h, cf_v, cf_hv) \ void ff_hevc_qpel_h_ ## width ## _ ## depth ## _ ## cf_h(int16_t *dst, ptrdiff_t dststride, \ @@ -129,7 +129,7 @@ QPEL_FUNCS(32, 10, avx, avx, avx) QPEL_FUNCS(48, 10, avx, avx, avx) QPEL_FUNCS(64, 10, avx, avx, avx) -#if ARCH_X86_64 +#if ARCH_X86_64 && HAVE_AVX_EXTERNAL #define EPEL_FUNC_HV(width, depth, cf_h, cf_v, cf_hv) \ static void hevc_epel_hv_ ## width ## _ ## depth ## _ ## cf_hv(int16_t *dst, ptrdiff_t dststride, \ uint8_t *src, ptrdiff_t srcstride, \ @@ -143,7 +143,7 @@ static void hevc_epel_hv_ ## width ## _ ## depth ## _ ## cf_hv(int16_t *dst, ptr } #else #define EPEL_FUNC_HV(width, depth, cf_h, cf_v, cf_hv) -#endif +#endif /* ARCH_X86_64 && HAVE_AVX_EXTERNAL */ #define EPEL_FUNCS(width, depth, cf_h, cf_v, cf_hv) \ void ff_hevc_epel_h_ ## width ## _ ## depth ## _ ## cf_h(int16_t *dst, ptrdiff_t dststride, \ @@ -277,8 +277,10 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) } if (EXTERNAL_AVX(cpu_flags)) { +#if HAVE_AVX_EXTERNAL SET_QPEL_FUNCS(1, 1, 8, avx, hevc_qpel_hv); SET_EPEL_FUNCS(1, 1, 8, avx, hevc_epel_hv); +#endif /* HAVE_AVX_EXTERNAL */ } } else if (bit_depth == 10) { if (EXTERNAL_SSSE3(cpu_flags)) { @@ -292,12 +294,14 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) SET_CHROMA_FUNCS(weighted_pred_avg_chroma, ff_hevc_put_weighted_pred_avg, 10, sse4); } if (EXTERNAL_AVX(cpu_flags)) { +#if HAVE_AVX_EXTERNAL SET_QPEL_FUNCS(0, 1, 10, avx, ff_hevc_qpel_h); SET_QPEL_FUNCS(1, 0, 10, avx, ff_hevc_qpel_v); SET_QPEL_FUNCS(1, 1, 10, avx, hevc_qpel_hv); SET_EPEL_FUNCS(0, 1, 10, avx, ff_hevc_epel_h); SET_EPEL_FUNCS(1, 0, 10, avx, ff_hevc_epel_v); SET_EPEL_FUNCS(1, 1, 10, avx, hevc_epel_hv); +#endif /* HAVE_AVX_EXTERNAL */ } } #endif /* ARCH_X86_64 */ |