diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:08:50 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:08:50 +0200 |
| commit | 194efde18f8f2621f847bd2bc2c13bf58e865730 (patch) | |
| tree | a98b71eb9727c082d71d1fc728c76e0393ea8b2a /mp3lib | |
| parent | 415a39cad0c801a9b904e75090730dbe5232142d (diff) | |
| parent | e59081d1218547907a143ab54e1feaec43ec2bff (diff) | |
| download | mpv-194efde18f8f2621f847bd2bc2c13bf58e865730.tar.bz2 mpv-194efde18f8f2621f847bd2bc2c13bf58e865730.tar.xz | |
Merge svn changes up to r30702
Diffstat (limited to 'mp3lib')
| -rw-r--r-- | mp3lib/decode_mmx.c | 1 | ||||
| -rw-r--r-- | mp3lib/mpg123.h | 9 | ||||
| -rw-r--r-- | mp3lib/sr1.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c index de48cd41b7..211630f219 100644 --- a/mp3lib/decode_mmx.c +++ b/mp3lib/decode_mmx.c @@ -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[] = diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h index f55fb27e43..3d98366b4f 100644 --- a/mp3lib/mpg123.h +++ b/mp3lib/mpg123.h @@ -129,6 +129,15 @@ void dct36_3dnow(real *, real *, 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 *); diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 43afb6a674..5a13344514 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -383,14 +383,6 @@ static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs /* 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" |