From 5f0b5dcaa96326512835afbae46c30aeaa164b13 Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 15 Dec 2009 20:25:50 +0000 Subject: Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index a7d1d1de8b..f4e1863879 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3142,7 +3142,7 @@ vdpau, x11, xv, xvmc). .br .I NOTE: This option is only supported by the x11, xmga, xv, xvmc, xvidix, -gl, gl2, directx, fbdev and tdfxfb video output drivers. +gl, gl2, directx, fbdev, tdfxfb and corevideo video output drivers. .sp 1 .I EXAMPLE: .PD 0 @@ -3330,7 +3330,7 @@ This option is not suitable to only set the startup screen (because it will always display on the given screen in fullscreen mode), \-geometry is the best that is available for that purpose currently. -Supported by at least the direct3d, gl, gl2, x11 and xv video output drivers. +Supported by at least the direct3d, gl, gl2, x11, xv and corevideo video output drivers. . .TP .B \-zrbw (\-vo zr only) -- cgit v1.2.3 From 2a33cd01f6d969600a56e9ea28d1504be7e7eafd Mon Sep 17 00:00:00 2001 From: adrian Date: Tue, 15 Dec 2009 20:38:54 +0000 Subject: Add support for -geometry to corevideo. Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index f4e1863879..37165f480d 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3138,7 +3138,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). +vdpau, x11, xv, xvmc, corevideo). .br .I NOTE: This option is only supported by the x11, xmga, xv, xvmc, xvidix, -- cgit v1.2.3 From c911be40734a8c6bd9609f40f915e4dc764ff0b3 Mon Sep 17 00:00:00 2001 From: jrash Date: Fri, 18 Dec 2009 11:15:09 +0000 Subject: sync with en/mplayer.1 r30053 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30054 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/zh_CN/mplayer.1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'DOCS/man') diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 699e982da7..e026e4a002 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 r29905 +.\" sync with en/mplayer.1 r30053 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -2935,14 +2935,14 @@ x 和 y 代表从屏幕左上角到显示图像左上角的距离(以像素为 如果使用 \-wid 选项指定了外部窗口, 那么 x 和 y 坐标是相对于窗口而不是屏幕的左上角。 坐标是相对于 \-xineramascreen 选项给出的屏幕，该屏幕用于完全支持 \-xineramascreen 的 -视频输出的驱动（direct3d、gl、gl2、vdpau、x11、xv、xvmc）。 +视频输出的驱动（direct3d、gl、gl2、vdpau、x11、xv、xvmc、corevideo）。 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). .br .I 注意： -此选项仅被 x11、xmga、xv、xvmc、xvidix、 -gl、gl2、directx、fbdev 和 tdfxfb 视频输出驱动支持。 +此选项仅被 x11、xmga、xv、xvmc、xvidix、gl、gl2、directx、fbdev、tdfxfb 和 +corevideo 视频输出驱动支持。 .sp 1 .I 示例: .PD 0 @@ -3116,7 +3116,7 @@ ggi 和 gl2 的都支持此功能。 通常只能与 "\-fstype \-fullscreen" 或 "\-fstype none" 一起工作。 该选项不适用于仅仅设置启动屏幕（并且也不适合设置全屏屏幕），\-geometry 是目前可用 于此目的的最好选项。 -至少 direct3d、gl、gl2、x11 和 xv 视频输出驱动支持该选项。 +至少 direct3d、gl、gl2、x11、xv 和 corevideo 视频输出驱动支持该选项。 .TP .B \-zrbw (仅用于 \-vo zr) 黑白显示。 -- cgit v1.2.3