Merge svn changes up to r28087

Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h

1 files changed, 14 insertions, 14 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);