From 1783ce38f687e85bd164e16aff16b64fbdab2dbb Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Feb 2010 22:29:57 +0000 Subject: Fix compilation: the dct64_MMX_func variable should be declared only once, not every time the header is included. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30724 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/mpg123.h | 2 +- mp3lib/sr1.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'mp3lib') diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h index 3d98366b4f..5a7548250a 100644 --- a/mp3lib/mpg123.h +++ b/mp3lib/mpg123.h @@ -134,7 +134,7 @@ 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 *); +extern void (*dct64_MMX_func)(short *, short *, real *); void mp3lib_dct64(real *, real *, real *); diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 72502d61ee..694961ebc0 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -387,6 +387,8 @@ static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs /* PUBLIC FUNCTIONS */ /******************************************************************************/ +void (*dct64_MMX_func)(short *, short *, real *); + #include "layer2.c" #include "layer3.c" #include "layer1.c" -- cgit v1.2.3