avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
authorDiego Biurrun <diego@biurrun.de>
Wed, 29 Aug 2012 17:37:14 +0000 (19:37 +0200)
committerDiego Biurrun <diego@biurrun.de>
Fri, 12 Oct 2012 17:58:51 +0000 (19:58 +0200)
libavfilter/vf_gradfun.c
libavfilter/vf_yadif.c
libavfilter/x86/Makefile

index 7fbcf1a..2ee8b5d 100644 (file)
@@ -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);
index 947aaac..1c605d9 100644 (file)
@@ -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",
index 46fc84f..4289f92 100644 (file)
@@ -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