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

[reimar]

Author: reimar
Date: Tue Feb 23 23:29:57 2010
New Revision: 30724

Log:
Fix compilation: the dct64_MMX_func variable should be declared only once,
not every time the header is included.

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

Modified: trunk/mp3lib/mpg123.h
==============================================================================
--- trunk/mp3lib/mpg123.h	Tue Feb 23 21:16:30 2010	(r30723)
+++ trunk/mp3lib/mpg123.h	Tue Feb 23 23:29:57 2010	(r30724)
@@ -134,7 +134,7 @@ void dct64_MMX_3dnow(short *, short *, r
 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 *);
+extern void (*dct64_MMX_func)(short *, short *, real *);
 
 void mp3lib_dct64(real *, real *, real *);
 

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	Tue Feb 23 21:16:30 2010	(r30723)
+++ trunk/mp3lib/sr1.c	Tue Feb 23 23:29:57 2010	(r30724)
@@ -387,6 +387,8 @@ static int _has_mmx = 0;  // used by lay
 /*           PUBLIC FUNCTIONS                  */
 /******************************************************************************/
 
+void (*dct64_MMX_func)(short *, short *, real *);
+
 #include "layer2.c"
 #include "layer3.c"
 #include "layer1.c"