Mercurial > mplayer.hg

changeset 30682:5fdc3c62cf76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation: the dct64_MMX_func variable should be declared only once, not every time the header is included.
author reimar
date Tue, 23 Feb 2010 22:29:57 +0000
parents 5892578d325b
children c744dec7ed98
files mp3lib/mpg123.h mp3lib/sr1.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mp3lib/mpg123.h	Tue Feb 23 20:16:30 2010 +0000
+++ b/mp3lib/mpg123.h	Tue Feb 23 22:29:57 2010 +0000
@@ -134,7 +134,7 @@
 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 *);
 
--- a/mp3lib/sr1.c	Tue Feb 23 20:16:30 2010 +0000
+++ b/mp3lib/sr1.c	Tue Feb 23 22:29:57 2010 +0000
@@ -387,6 +387,8 @@
 /*           PUBLIC FUNCTIONS                  */
 /******************************************************************************/
 
+void (*dct64_MMX_func)(short *, short *, real *);
+
 #include "layer2.c"
 #include "layer3.c"
 #include "layer1.c"