Remove -noxv and -forcexv command line options and replace them by

suboptions to -vo sdl. Renamed noxv to nohwaccel to better reflect the
meaning of the option. Updated manual page.

Original patch by < ods15 at ods15 dot dyndns dot org>
Modified by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14858 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 7 insertions, 11 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 02f604ea0b..11ec0cfdaf 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -2058,10 +2058,6 @@ VESA framebuffer doesn't support mode changing.
 Override framebuffer mode configuration file (default: /etc/\:fb.modes).
 .
 .TP
-.B \-forcexv (\-vo sdl only)
-Force using XVideo through the sdl video output driver.
-.
-.TP
 .B \-fs (also see \-zoom)
 Fullscreen playback (centers movie, and paints black bands around it).
 Not supported by all video output drivers.
@@ -2201,10 +2197,6 @@ Only works with the x11, xv, xmga, xvidix, directx video output drivers.
 Furthermore under X11 your window manager has to honor window aspect hints.
 .
 .TP
-.B \-noxv (\-vo sdl only)
-Disables using XVideo through the sdl video output driver.
-.
-.TP
 .B \-ontop\ 
 Makes the player window stay on top of other windows.
 Supported by video output drivers which use X11, except SDL,
@@ -2418,15 +2410,19 @@ Play video through the XFree86 Direct Graphics Access extension.
 Considered obsolete.
 .
 .TP
-.B sdl (also see \-forcexv, \-noxv) (SDL only)
+.B sdl (SDL only)
 Highly platform independent SDL (Simple Directmedia Layer) library
 video output driver.
 Since SDL uses its own X11 layer, MPlayer X11 options do not have
 any effect on SDL.
 .PD 0
 .RSs
-.IPs <driver>
-Explicitly choose the SDL driver to use.
+.IPs driver=<driver>
+Explicitly choose the SDL driver to use (default: x11).
+.IPs (no)forcexv
+Use XVideo through the sdl video output driver (default: forcexv).
+.IPs (no)hwaccel
+Use hardware accelerated scaler (default: hwaccel).
 .RE
 .PD 1
 .