diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 | |
parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz |
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
131 files changed, 1651 insertions, 1160 deletions
@@ -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/mplayer.1 index 2b1ebc814f..637bc4c82c 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r27236 +.\" synced with r27407 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -4149,6 +4149,10 @@ Choisit explicitement le périphérique fbdev à utiliser (par défaut\ : .PD 1 . .TP +.B wii (Linux uniquement) +Pilote de sortie vidéo spécifique aux consoles Nintendo Wii et GameCube. +. +.TP .B 3dfx (Linux uniquement) Pilote de sortie vidéo spécifique aux cartes 3dfx, qui exploite directement les circuits matériels 3dfx sous X11. diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 4710251756..965260bc21 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -1,4 +1,4 @@ -.\" Synced with r27236 +.\" Synced with r27407 .\" MPlayer (C) 2000-2008 MPlayer Team .\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/ké |