Commit 1dbd3c61 authored by James Almer's avatar James Almer

avfilter/vf_eq: fix compilation with x86 asm disabled

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 1ac0d551
...@@ -43,7 +43,7 @@ X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o ...@@ -43,7 +43,7 @@ X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o
X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o
X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o
X86ASM-OBJS-$(CONFIG_CONVOLUTION_FILTER) += x86/vf_convolution.o X86ASM-OBJS-$(CONFIG_CONVOLUTION_FILTER) += x86/vf_convolution.o
X86ASM-OBJS-$(CONFIG_CONVOLUTION_FILTER) += x86/vf_eq.o X86ASM-OBJS-$(CONFIG_EQ_FILTER) += x86/vf_eq.o
X86ASM-OBJS-$(CONFIG_FRAMERATE_FILTER) += x86/vf_framerate.o X86ASM-OBJS-$(CONFIG_FRAMERATE_FILTER) += x86/vf_framerate.o
X86ASM-OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp.o X86ASM-OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp.o
X86ASM-OBJS-$(CONFIG_GBLUR_FILTER) += x86/vf_gblur.o X86ASM-OBJS-$(CONFIG_GBLUR_FILTER) += x86/vf_gblur.o
......
...@@ -31,6 +31,7 @@ extern void ff_process_one_line_mmxext(const uint8_t *src, uint8_t *dst, short c ...@@ -31,6 +31,7 @@ extern void ff_process_one_line_mmxext(const uint8_t *src, uint8_t *dst, short c
extern void ff_process_one_line_sse2(const uint8_t *src, uint8_t *dst, short contrast, extern void ff_process_one_line_sse2(const uint8_t *src, uint8_t *dst, short contrast,
short brightness, int w); short brightness, int w);
#if HAVE_X86ASM
static void process_mmxext(EQParameters *param, uint8_t *dst, int dst_stride, static void process_mmxext(EQParameters *param, uint8_t *dst, int dst_stride,
const uint8_t *src, int src_stride, int w, int h) const uint8_t *src, int src_stride, int w, int h)
{ {
...@@ -59,15 +60,17 @@ static void process_sse2(EQParameters *param, uint8_t *dst, int dst_stride, ...@@ -59,15 +60,17 @@ static void process_sse2(EQParameters *param, uint8_t *dst, int dst_stride,
dst += dst_stride; dst += dst_stride;
} }
} }
#endif
av_cold void ff_eq_init_x86(EQContext *eq) av_cold void ff_eq_init_x86(EQContext *eq)
{ {
#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(cpu_flags)) {
if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
eq->process = process_mmxext; eq->process = process_mmxext;
} }
if (cpu_flags & AV_CPU_FLAG_SSE2) { if (EXTERNAL_SSE2(cpu_flags)) {
eq->process = process_sse2; eq->process = process_sse2;
} }
#endif
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment