aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-05-23 01:20:42 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-05-23 01:20:42 +0000
commit364f4a362060d194bbb6473e8a9661108c0cda8a (patch)
treee248923289a2a37a6ea6a9e052db03c23b1f7374
parent5624766d18f0529487d074e96dce9084b6561996 (diff)
downloadffmpeg-364f4a362060d194bbb6473e8a9661108c0cda8a.tar.gz
Revert part of r18903:
MLP DSP functions x86-optimized. 12.59% overall speedup in x86_32 9.98% overall speedup in x86_64 compared to gcc 4.3.3 It breaks on x86_64 with PIC because the MANGLE macro appends (%%rip), which is not wanted for labels. Originally committed as revision 18904 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/mlpdsp.c4
2 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 18ca9eae62..551576a7bb 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -445,10 +445,8 @@ 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 79059d925a..6519b16eab 100644
--- a/libavcodec/mlpdsp.c
+++ b/libavcodec/mlpdsp.c
@@ -55,11 +55,7 @@ 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);
}