---
libavfilter/vf_gradfun.c | 7 ++++---
libavfilter/x86/Makefile | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index c6663c4..8364f9f 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -37,6 +37,7 @@
#include "libavutil/pixdesc.h"
#include "avfilter.h"
#include "gradfun.h"
+#include "config.h"
DECLARE_ALIGNED(16, static const uint16_t, dither)[8][8] = {
{0x00,0x60,0x18,0x78,0x06,0x66,0x1E,0x7E},
@@ -132,11 +133,11 @@ static av_cold int init(AVFilterContext *ctx, const char
*args, void *opaque)
gf->blur_line = ff_gradfun_blur_line_c;
gf->filter_line = ff_gradfun_filter_line_c;
- if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX2)
+ if (CONFIG_GPL && HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX2)
gf->filter_line = ff_gradfun_filter_line_mmx2;
- if (HAVE_SSSE3 && cpu_flags & AV_CPU_FLAG_SSSE3)
+ if (CONFIG_GPL && HAVE_SSSE3 && cpu_flags & AV_CPU_FLAG_SSSE3)
gf->filter_line = ff_gradfun_filter_line_ssse3;
- if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2)
+ if (CONFIG_GPL && HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2)
gf->blur_line = ff_gradfun_blur_line_sse2;
av_log(ctx, AV_LOG_INFO, "threshold:%.2f radius:%d\n", thresh, gf->radius);
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
index e98693d..e653f6a 100644
--- a/libavfilter/x86/Makefile
+++ b/libavfilter/x86/Makefile
@@ -1,2 +1,3 @@
+GPL-OBJS-$(CONFIG_GPL) += x86/gradfun.o
+MMX-OBJS-$(CONFIG_GRADFUN_FILTER) += $(GPL-OBJS-yes)
MMX-OBJS-$(CONFIG_YADIF_FILTER) += x86/yadif.o
-MMX-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/gradfun.o
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
