diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
commit | efcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch) | |
tree | eb15edb75377eedd5d7397209e8c0d594020663e /DOCS/man | |
parent | 1598302be65c77c107330dc46fd0dabface3112d (diff) | |
parent | 8fcbe5835d038649e70da410d46c4f5cd502c261 (diff) | |
download | mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2 mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz |
Merge svn changes up to r30055
Diffstat (limited to 'DOCS/man')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 6 | ||||
-rw-r--r-- | DOCS/man/zh_CN/mplayer.1 | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 0393c47dda..29efd7c437 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3115,11 +3115,11 @@ 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, -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 @@ -3305,7 +3305,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) 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) 黑白显示。 |