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/mp_msg.c b/mp_msg.c
index 2f9f32c098..6cd6f8e121 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -8,7 +8,7 @@
 #ifdef CONFIG_ICONV
 #include <iconv.h>
 #include <errno.h>
-extern char* get_term_charset(void);
+char* get_term_charset(void);
 #endif
 
 #if defined(FOR_MENCODER)