[MPlayer-cvslog] r30700 - in trunk/mp3lib: decode_mmx.c mpg123.h sr1.c

[diego]

Author: diego
Date: Mon Feb 22 14:52:59 2010
New Revision: 30700

Log:
Declare all public mp3lib functions in mpg123.h.

Modified:
   trunk/mp3lib/decode_mmx.c
   trunk/mp3lib/mpg123.h
   trunk/mp3lib/sr1.c

Modified: trunk/mp3lib/decode_mmx.c
==============================================================================
--- trunk/mp3lib/decode_mmx.c	Mon Feb 22 14:51:58 2010	(r30699)
+++ trunk/mp3lib/decode_mmx.c	Mon Feb 22 14:52:59 2010	(r30700)
@@ -11,7 +11,6 @@
 #include "mangle.h"
 #include "mpg123.h"
 
-extern void (*dct64_MMX_func)(short*, short*, real*);
 static const unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
 static const unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
 const unsigned int __attribute__((aligned(16))) costab_mmx[] =

Modified: trunk/mp3lib/mpg123.h
==============================================================================
--- trunk/mp3lib/mpg123.h	Mon Feb 22 14:51:58 2010	(r30699)
+++ trunk/mp3lib/mpg123.h	Mon Feb 22 14:52:59 2010	(r30700)
@@ -129,6 +129,15 @@ void dct36_3dnow(real *, real *, real *,
 void dct36_3dnowex(real *, real *, real *, real *, real *);
 void dct36_sse(real *, real *, real *, real *, real *);
 
+void dct64_MMX(short *, short *, real *);
+void dct64_MMX_3dnow(short *, short *, real *);
+void dct64_MMX_3dnowex(short *, short *, real *);
+void dct64_sse(short *, short *, real *);
+void dct64_altivec(real *, real *, real *);
+void (*dct64_MMX_func)(short *, short *, real *);
+
+void mp3lib_dct64(real *, real *, real *);
+
 typedef int (*synth_func_t)( real *,int,short * );
 typedef void (*dct36_func_t)(real *,real *,real *,real *,real *);
 

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	Mon Feb 22 14:51:58 2010	(r30699)
+++ trunk/mp3lib/sr1.c	Mon Feb 22 14:52:59 2010	(r30700)
@@ -387,14 +387,6 @@ static int _has_mmx = 0;  // used by lay
 /*           PUBLIC FUNCTIONS                  */
 /******************************************************************************/
 
-/* It's hidden from gcc in assembler */
-void dct64_MMX(short *, short *, real *);
-void dct64_MMX_3dnow(short *, short *, real *);
-void dct64_MMX_3dnowex(short *, short *, real *);
-void dct64_sse(short *, short *, real *);
-void dct64_altivec(real *, real *, real *);
-void (*dct64_MMX_func)(short *, short *, real *);
-
 #include "layer2.c"
 #include "layer3.c"
 #include "layer1.c"