ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Nov 21 12:21:38 2018 -0300| [3913d6f7348482d0ad914cb35e74b29b1385d9bd] | committer: James Almer
x86/scene_sad: fix link errors when HAVE_X86ASM is not defined Reviewed-by: Haihao Xiang <haihao.xi...@intel.com> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3913d6f7348482d0ad914cb35e74b29b1385d9bd --- libavfilter/x86/scene_sad_init.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
