summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-05-25 01:53:43 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-05-25 01:53:43 +0000
commitcbd7836e88220a3c4722858635394ff65aac28d8 (patch)
tree5ba018469cae912863a9a30e6b2f687c573a11be
parent7c4c60e520054f04f37a110ecefcc408fb9d5fda (diff)
mlp: Re-enable x86-optimized DSP functions.
Originally committed as revision 18936 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/mlpdsp.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 461cb41844..3df0d458a3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -445,8 +445,10 @@ MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o
MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
+MMX-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o
MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c
index 6519b16eab..79059d925a 100644
--- a/libavcodec/mlpdsp.c
+++ b/libavcodec/mlpdsp.c
@@ -55,7 +55,11 @@ static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff,
}
}
+void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx);
+
void ff_mlp_init(DSPContext* c, AVCodecContext *avctx)
{
c->mlp_filter_channel = ff_mlp_filter_channel;
+ if (ARCH_X86)
+ ff_mlp_init_x86(c, avctx);
}