131 files changed, 1651 insertions, 1160 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
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 888f3454b4..33301f5fc3 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3928,6 +3928,10 @@ Explicitly choose the fbdev device name to use (default: /dev/\:fb0).
 .PD 1
 .
 .TP
+.B wii (Linux only)
+Nintendo Wii/GameCube specific video output driver.
+.
+.TP
 .B 3dfx (Linux only)
 3dfx-specific video output driver that directly uses
 the hardware on top of X11.
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr