diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
| commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
| tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /mp3lib | |
| parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
| parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
| download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz | |
Merge svn changes up to r30732
Diffstat (limited to 'mp3lib')
| -rw-r--r-- | mp3lib/mpg123.h | 2 | ||||
| -rw-r--r-- | mp3lib/sr1.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 5a13344514..3b3a2af204 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -383,6 +383,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" |