diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-14 17:28:16 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-14 17:28:16 +0200 |
| commit | a3ab9e8e4649601281f78949e56b92755ae1142a (patch) | |
| tree | e31ee1ff4bafbfcf75c16259d9a64d18fea3bd51 /mp3lib | |
| parent | f01f7f6259badb2725be49af914d8db52e025cf6 (diff) | |
| parent | bac1f05b4da4339b487e4e6ab972819142b3f13e (diff) | |
| download | mpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.bz2 mpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.xz | |
Merge svn changes up to r28149
Diffstat (limited to 'mp3lib')
| -rw-r--r-- | mp3lib/mp3.h | 2 | ||||
| -rw-r--r-- | mp3lib/sr1.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mp3lib/mp3.h b/mp3lib/mp3.h index daeda20856..d43b5f8bcb 100644 --- a/mp3lib/mp3.h +++ b/mp3lib/mp3.h @@ -4,7 +4,7 @@ #ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono); #else -void MP3_Init(); +void MP3_Init(void); #endif int MP3_Open(char *filename, int buffsize); void MP3_SeekFrame(int num, int dir); diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 49feb45343..c5a0a1b9e7 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -403,7 +403,7 @@ void (*dct64_MMX_func)(short *, short *, real *); #ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono){ #else -void MP3_Init(){ +void MP3_Init(void){ #endif //gCpuCaps.hasMMX=gCpuCaps.hasMMX2=gCpuCaps.hasSSE=0; // for testing! |