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, 24 insertions, 24 deletions

diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 9fed1cf1ca..a96476e530 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -23,29 +23,29 @@
 
 extern int mplGotoTheNext;
 
-extern void mplEnd( void );
-extern void mplFullScreen( void );
-extern void mplPlay( void );
-extern void mplPause( void );
-extern void mplState( void );
-extern void mplPrev( void );
-extern void mplNext( void );
-extern void mplCurr( void );
-
-extern void mplIncAudioBufDelay( void );
-extern void mplDecAudioBufDelay( void );
-
-extern void  mplRelSeek( float s );
-extern void  mplAbsSeek( float s );
-extern float mplGetPosition( void );
-
-extern void mplPlayFork( void );
-extern void mplSigHandler( int s );
-extern void mplPlayerThread( void );
-
-extern void ChangeSkin( char * name );
-extern void EventHandling( void );
-
-extern void mplSetFileName( char * dir,char * name,int type );
+void mplEnd( void );
+void mplFullScreen( void );
+void mplPlay( void );
+void mplPause( void );
+void mplState( void );
+void mplPrev( void );
+void mplNext( void );
+void mplCurr( void );
+
+void mplIncAudioBufDelay( void );
+void mplDecAudioBufDelay( void );
+
+void  mplRelSeek( float s );
+void  mplAbsSeek( float s );
+float mplGetPosition( void );
+
+void mplPlayFork( void );
+void mplSigHandler( int s );
+void mplPlayerThread( void );
+
+void ChangeSkin( char * name );
+void EventHandling( void );
+
+void mplSetFileName( char * dir, char * name, int type );
 
 #endif /* MPLAYER_GUI_PLAY_H */