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

diff --git a/mplayer.h b/mplayer.h
index 9187e6baa2..c59b4ca723 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -48,6 +48,6 @@ static inline void exit_player_bad(const char *how)
 
 struct MPContext;
 
-extern void update_set_of_subtitles(struct MPContext *mpctx);
+void update_set_of_subtitles(struct MPContext *mpctx);
 
 #endif /* MPLAYER_MPLAYER_H */