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

x86/scene_sad: fix link errors when HAVE_X86ASM is not defined

Browse Source 
Reviewed-by: Haihao Xiang <haihao.xiang@intel.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-11-21 12:21:38 -03:00
parent d290bb0c54
commit 3913d6f734
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/x86/scene_sad_init.c
View File

@ -36,17 +36,25 @@ static void FUNC_NAME(SCENE_SAD_PARAMS) { \
*sum += sad[0]; \ *sum += sad[0]; \
} }
#if HAVE_X86ASM
SCENE_SAD_FUNC(scene_sad_sse2, ff_scene_sad_sse2, 16); 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); 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) ff_scene_sad_fn ff_scene_sad_get_fn_x86(int depth)
{ {
#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (depth == 8) { if (depth == 8) {
#if HAVE_AVX2_EXTERNAL
if (EXTERNAL_AVX2_FAST(cpu_flags)) if (EXTERNAL_AVX2_FAST(cpu_flags))
return scene_sad_avx2; return scene_sad_avx2;
else if (EXTERNAL_SSE2(cpu_flags)) #endif
if (EXTERNAL_SSE2(cpu_flags))
return scene_sad_sse2; return scene_sad_sse2;
} }
#endif
return NULL; return NULL;
} }