summaryrefslogtreecommitdiff
path: root/libavcodec/x86/mpegaudiodec_mmx.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-05-16 16:52:01 +0100
committerMans Rullgard <mans@mansr.com>2011-05-19 12:25:34 +0100
commitc4f5c2d6f4ffa3f4b56555059000208a6ba47b55 (patch)
treef46c4f0d94a1e073ac0dae24fab4d1d972bcb2c6 /libavcodec/x86/mpegaudiodec_mmx.c
parentea91e77127229015d23a046f1797d3fc6a33e54d (diff)
Move some mpegaudio functions to new mpegaudiodsp subsystem
This separation allows these functions to be used in a cleaner fashion from other codecs (e.g. qdm2) and simplifies creating optimised versions of them. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/x86/mpegaudiodec_mmx.c')
-rw-r--r--libavcodec/x86/mpegaudiodec_mmx.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/x86/mpegaudiodec_mmx.c b/libavcodec/x86/mpegaudiodec_mmx.c
index ce5b7d6df8..b64461513e 100644
--- a/libavcodec/x86/mpegaudiodec_mmx.c
+++ b/libavcodec/x86/mpegaudiodec_mmx.c
@@ -21,9 +21,8 @@
#include "libavutil/cpu.h"
#include "libavutil/x86_cpu.h"
-
-#define CONFIG_FLOAT 1
-#include "libavcodec/mpegaudio.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegaudiodsp.h"
#define MACS(rt, ra, rb) rt+=(ra)*(rb)
#define MLSS(rt, ra, rb) rt-=(ra)*(rb)
@@ -148,11 +147,11 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
*out = sum;
}
-void ff_mpegaudiodec_init_mmx(MPADecodeContext *s)
+void ff_mpadsp_init_mmx(MPADSPContext *s)
{
int mm_flags = av_get_cpu_flags();
if (mm_flags & AV_CPU_FLAG_SSE2) {
- s->apply_window_mp3 = apply_window_mp3;
+ s->apply_window_float = apply_window_mp3;
}
}