From cbdb7e630526753efd5716bb67cf627393f3258c Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 9 May 2011 20:15:23 +0300 Subject: vo_xvmc: drop XvMC support Due to libavcodec changes vo_xvmc would have needed some modifications to keep working. However, I think there's little real demand for XvMC, so I'll just drop XvMC support. XvMC only supported MPEG-2, making it of very limited usefulness nowadays, plus the vo_xvmc implementation was not high quality and never worked particularly well or reliably anyway. --- DOCS/man/en/mplayer.1 | 46 ++++++---------------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 6469f51e10..3ca8ff01f5 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -267,7 +267,7 @@ Show filename on the OSD. Show progression bar, elapsed time and total duration on the OSD. .IPs "! and @" Seek to the beginning of the previous/next chapter. -.IPs "D (\-vo xvmc, \-vo vdpau, \-vf yadif, \-vf kerndeint only)" +.IPs "D (\-vo vdpau, \-vf yadif, \-vf kerndeint only)" Activate/deactivate deinterlacer. .IPs "A\ \ \ \ " Cycle through the available DVD angles. @@ -748,15 +748,13 @@ chapter change instead of doing a seek. Changes the colorkey to an RGB value of your choice. 0x000000 is black and 0xffffff is white. Only supported by the fbdev, svga, vesa, xmga, -xover, xv (see \-vo xv:ck), xvmc (see \-vo xv:ck) and directx video output -drivers. +xover, xv (see \-vo xv:ck) and directx video output drivers. . .TP .B \-nocolorkey Disables colorkeying. Only supported by the fbdev, svga, vesa, xmga, -xover, xv (see \-vo xv:ck), xvmc (see \-vo xv:ck) and directx video output -drivers. +xover, xv (see \-vo xv:ck) and directx video output drivers. . .TP .B \-correct\-pts, \-nocorrect\-pts @@ -978,7 +976,7 @@ Display the main menu at MPlayer startup. Permit MPlayer to receive pointer events reported by the video output driver. Necessary to select the buttons in DVD menus. -Supported for X11-based VOs (x11, xv, xvmc, etc) and the gl, gl2, direct3d and +Supported for X11-based VOs (x11, xv, etc) and the gl, gl2, direct3d and corevideo VOs. . .TP @@ -3171,7 +3169,7 @@ y coordinates are relative to the top-left corner of the window rather than the screen. The coordinates are relative to the screen given with \-xineramascreen for the video output drivers that fully support \-xineramascreen (direct3d, gl, gl2, -vdpau, x11, xv, xvmc, corevideo). +vdpau, x11, xv, corevideo). .br .I NOTE: May not be supported by some of the older VO drivers. @@ -3558,38 +3556,6 @@ surfaces that work well or at all. .PD 1 . .TP -.B xvmc (X11 with \-vc ffmpeg12mc only) -Video output driver that uses the XvMC (X Video Motion Compensation) -extension of XFree86 4.x to speed up MPEG-1/2 and VCR2 decoding. -.PD 0 -.RSs -.IPs adaptor= -Select a specific XVideo adaptor (check xvinfo results). -.IPs port= -Select a specific XVideo port. -.IPs (no)benchmark -Disables image display. -Necessary for proper benchmarking of drivers that change -image buffers on monitor retrace only (nVidia). -Default is not to disable image display (nobenchmark). -.IPs (no)bobdeint -Very simple deinterlacer. -Might not look better than \-vf tfields=1, -but it is the only deinterlacer for xvmc (default: nobobdeint). -.IPs (no)queue -Queue frames for display to allow more parallel work of the video hardware. -May add a small (not noticeable) constant A/V desync (default: noqueue). -.IPs (no)sleep -Use sleep function while waiting for rendering to finish -(not recommended on Linux) (default: nosleep). -.IPs ck=cur|use|set -Same as \-vo xv:ck (see \-vo xv). -.IPs ck-method=man|bg|auto -Same as \-vo xv:ck-method (see \-vo xv). -.RE -.PD 1 -. -.TP .B dga (X11 only) Play video through the XFree86 Direct Graphics Access extension. Considered obsolete. @@ -4516,7 +4482,7 @@ Disable automatic movie aspect ratio compensation. .B "\-field\-dominance <\-1\-1>" Set first field for interlaced content. Useful for deinterlacers that double the framerate: \-vf tfields=1, -\-vf yadif=1, \-vo vdpau:deint and \-vo xvmc:bobdeint. +\-vf yadif=1 and \-vo vdpau:deint. .PD 0 .RSs .IPs \-1 -- cgit v1.2.3