From f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 29 Aug 2012 19:37:14 +0200
Subject: [PATCH] avfilter: call x86 init functions under if (ARCH_X86), not if
(HAVE_MMX)
---
libavfilter/vf_gradfun.c | 2 +-
libavfilter/vf_yadif.c | 2 +-
libavfilter/x86/Makefile | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index 7fbcf1a578f..2ee8b5d60d9 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -135,7 +135,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
gf->blur_line = ff_gradfun_blur_line_c;
gf->filter_line = ff_gradfun_filter_line_c;
- if (HAVE_MMX)
+ if (ARCH_X86)
ff_gradfun_init_x86(gf);
av_log(ctx, AV_LOG_VERBOSE, "threshold:%.2f radius:%d\n", thresh, gf->radius);
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 947aaac49a0..1c605d942da 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -400,7 +400,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
yadif->filter_line = filter_line_c;
- if (HAVE_MMX)
+ if (ARCH_X86)
ff_yadif_init_x86(yadif);
av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n",
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
index 46fc84f3eca..4289f924da6 100644
--- a/libavfilter/x86/Makefile
+++ b/libavfilter/x86/Makefile
@@ -1,3 +1,4 @@
-MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o
-MMX-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/gradfun.o
+OBJS-$(CONFIG_GRADFUN_FILTER) += x86/gradfun.o
+OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o
+
YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/hqdn3d.o
--
GitLab