diff options
| author | James Almer <jamrial@gmail.com> | 2018-11-21 12:21:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-11-21 22:26:07 -0300 |
| commit | 3913d6f7348482d0ad914cb35e74b29b1385d9bd (patch) | |
| tree | e11ace7b7651dc36076a85225855f06a0e4e9b6f | |
| parent | d290bb0c540425e937d11ed88e22c68ab97c57eb (diff) | |
| download | ffmpeg-3913d6f7348482d0ad914cb35e74b29b1385d9bd.tar.gz | |
x86/scene_sad: fix link errors when HAVE_X86ASM is not defined
Reviewed-by: Haihao Xiang <haihao.xiang@intel.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavfilter/x86/scene_sad_init.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavfilter/x86/scene_sad_init.c b/libavfilter/x86/scene_sad_init.c index 461fa406d9..f8104dcb4f 100644 --- a/libavfilter/x86/scene_sad_init.c +++ b/libavfilter/x86/scene_sad_init.c @@ -36,17 +36,25 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \ *sum += sad[0]; \ } +#if HAVE_X86ASM SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16); +#if HAVE_AVX2_EXTERNAL SCENE_SAD_FUNC(scene_sad_avx2, ff_scene_sad_avx2, 32); +#endif +#endif ff_scene_sad_fn ff_scene_sad_get_fn_x86(int depth) { +#if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); if (depth == 8) { +#if HAVE_AVX2_EXTERNAL if (EXTERNAL_AVX2_FAST(cpu_flags)) return scene_sad_avx2; - else if (EXTERNAL_SSE2(cpu_flags)) +#endif + if (EXTERNAL_SSE2(cpu_flags)) return scene_sad_sse2; } +#endif return NULL; } |