Merge svn changes up to r27441

Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h

1 files changed, 1 insertions, 0 deletions

diff --git a/Changelog b/Changelog
index c1e41517be..e049cc30f3 100644
--- a/Changelog
+++ b/Changelog
@@ -54,6 +54,7 @@ MPlayer (1.0)
     Drivers:
     * replace PolypAudio by PulseAudio (-ao pulse)
     * add force-pbo suboption for faster output in vo_gl
+    * add Nintendo Wii/GameCube video driver (-vo wii)
 
     MEncoder:
     * Ogg muxing using -of lavf -o done.ogg