diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c index 5c1c7068de..872faaef02 100644 --- a/libavcodec/diracdsp.c +++ b/libavcodec/diracdsp.c @@ -20,7 +20,7 @@ #include "dsputil.h" #include "diracdsp.h" -/* MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h" */ +#include "libavcodec/x86/diracdsp_mmx.h" #define FILTER(src, stride) \ ((21*((src)[ 0*stride] + (src)[1*stride]) \ @@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c) PIXFUNC(avg, 16); PIXFUNC(avg, 32); - /* MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c); */ + if (HAVE_MMX) ff_diracdsp_init_mmx(c); } diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 082d5e0f0e..308f071424 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -27,7 +27,7 @@ MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o \ YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o -#DISABLE_MMX YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o +YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o