summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
commit0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d (patch)
treeacd33d7cbfa6a967626858375daa802c652dfe3f /mp3lib
parentd7a5babef76ba9324f303535745af21461bdcc84 (diff)
downloadmpv-0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d.tar.bz2
mpv-0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d.tar.xz
Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/mp3.h28
-rw-r--r--mp3lib/mpg123.h12
-rw-r--r--mp3lib/sr1.c14
3 files changed, 27 insertions, 27 deletions
diff --git a/mp3lib/mp3.h b/mp3lib/mp3.h
index f6f5a4dea7..daeda20856 100644
--- a/mp3lib/mp3.h
+++ b/mp3lib/mp3.h
@@ -2,18 +2,18 @@
/* decoder level: */
#ifdef CONFIG_FAKE_MONO
-extern void MP3_Init(int fakemono);
+void MP3_Init(int fakemono);
#else
-extern void MP3_Init();
+void MP3_Init();
#endif
-extern int MP3_Open(char *filename,int buffsize);
-extern void MP3_SeekFrame(int num,int dir);
-extern void MP3_SeekForward(int num);
-extern int MP3_PrintTAG(void);
-extern int MP3_DecodeFrame(unsigned char *hova,short single);
-extern int MP3_FillBuffers(void);
-extern void MP3_PrintHeader(void);
-extern void MP3_Close(void);
+int MP3_Open(char *filename, int buffsize);
+void MP3_SeekFrame(int num, int dir);
+void MP3_SeekForward(int num);
+int MP3_PrintTAG(void);
+int MP3_DecodeFrame(unsigned char *hova, short single);
+int MP3_FillBuffers(void);
+void MP3_PrintHeader(void);
+void MP3_Close(void);
/* public variables: */
extern int MP3_eof; // set if EOF reached
extern int MP3_pause; // lock playing
@@ -28,8 +28,8 @@ extern int MP3_channels;
extern int MP3_bps;
/* player level: */
-extern int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */
-extern void MP3_Play(void);
-extern void MP3_Stop(void);
-extern void MP3_CloseDevice(void);
+int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */
+void MP3_Play(void);
+void MP3_Stop(void);
+void MP3_CloseDevice(void);
diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h
index 2ecd5a47db..2cbef31bdd 100644
--- a/mp3lib/mpg123.h
+++ b/mp3lib/mpg123.h
@@ -116,13 +116,13 @@ struct III_sideinfo
extern real mp3lib_decwin[(512+32)];
extern real *mp3lib_pnts[];
-extern int synth_1to1_pent( real *,int,short * );
-extern int synth_1to1_MMX( real *,int,short * );
-extern int synth_1to1_MMX_s(real *, int, short *, short *, int *);
+int synth_1to1_pent( real *, int, short * );
+int synth_1to1_MMX( real *, int, short * );
+int synth_1to1_MMX_s(real *, int, short *, short *, int *);
-extern void dct36_3dnow(real *,real *,real *,real *,real *);
-extern void dct36_3dnowex(real *,real *,real *,real *,real *);
-extern void dct36_sse(real *,real *,real *,real *,real *);
+void dct36_3dnow(real *, real *, real *, real *, real *);
+void dct36_3dnowex(real *, real *, real *, real *, real *);
+void dct36_sse(real *, real *, 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 65a749ed10..49feb45343 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -51,7 +51,7 @@ static long outscale = 32768;
#include "tabinit.c"
#if 1
-extern int mplayer_audio_read(char *buf,int size);
+int mplayer_audio_read(char *buf,int size);
LOCAL int mp3_read(char *buf,int size){
// int len=fread(buf,1,size,mp3_file);
@@ -61,7 +61,7 @@ LOCAL int mp3_read(char *buf,int size){
return len;
}
#else
-extern int mp3_read(char *buf,int size);
+int mp3_read(char *buf,int size);
#endif
/*
* Modified for use with MPlayer, for details see the changelog at
@@ -386,11 +386,11 @@ static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs
/******************************************************************************/
/* It's hidden from gcc in assembler */
-extern void dct64_MMX(short *, short *, real *);
-extern void dct64_MMX_3dnow(short *, short *, real *);
-extern void dct64_MMX_3dnowex(short *, short *, real *);
-extern void dct64_sse(short *, short *, real *);
-extern void dct64_altivec(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 *);
#include "layer2.c"