From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Sat, 23 May 2009 01:20:42 +0000 (+0000)
Subject: Revert part of r18903:
X-Git-Tag: v0.6~4346
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=364f4a362060d194bbb6473e8a9661108c0cda8a;p=platform%2Fupstream%2Flibav.git

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
---

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 18ca9ea..551576a 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 79059d9..6519b16 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);
 }