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

diff --git a/gui/app.h b/gui/app.h
index 89f7a9e022..51cf978c34 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -191,14 +191,14 @@ extern char      * skinMPlayerDir;
 extern char      * skinMPlayerDir_obsolete;
 extern char      * skinName;
 
-extern void appInitStruct( listItems * item );
-extern void appClearItem( wItem * item );
-extern void appCopy( listItems * item1,listItems * item2 );
-extern int appFindMessage( unsigned char * str );
-extern int appFindKey( unsigned char * name );
-
-extern void btnModify( int event,float state );
-extern float btnGetValue( int event );
-extern void btnSet( int event,int set );
+void appInitStruct( listItems * item );
+void appClearItem( wItem * item );
+void appCopy( listItems * item1, listItems * item2 );
+int appFindMessage( unsigned char * str );
+int appFindKey( unsigned char * name );
+
+void btnModify( int event, float state );
+float btnGetValue( int event );
+void btnSet( int event, int set );
 
 #endif /* MPLAYER_GUI_APP_H */