summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-04 19:49:35 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-09-04 19:49:35 +0300
commit0e1b7765be878491565cf5e471f22b15e106164c (patch)
tree422e500c289335182a2a64934dcabf10b95e32dc /DOCS
parenta9618c1c6fe9424dfaeb1677348e0382d7252554 (diff)
parentdcfd043ea8d0c46929aad78596314d837c290d39 (diff)
downloadmpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2
mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz
Merge svn changes up to r29644
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.18
-rw-r--r--DOCS/man/zh_CN/mplayer.110
-rw-r--r--DOCS/tech/svn-howto.txt2
3 files changed, 15 insertions, 5 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index dc7a65febd..2c034424f4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -498,6 +498,11 @@ named 'movie.avi.conf' with the file-specific options in it and put it in
You can also put the configuration file in the same directory as the file to
be played, as long as you give the \-use\-filedir\-conf option (either on the
command line or in your global config file).
+If a file-specific configuration file is found in the same directory, no file-specific
+configuration is loaded from ~/.mplayer.
+In addition, the \-use\-filedir\-conf option enables directory-specific configuration files.
+For this, MPlayer first tries to load a mplayer.conf from the same directory as the file played
+and then tries to load any file-specific configuration.
.PP
.I EXAMPLE MPLAYER CONFIGURATION FILE:
.sp 1
@@ -3232,6 +3237,9 @@ Enables VBI for the vesa, dfbmga and svga video output drivers.
.B \-wid <window ID> (X11, OpenGL and DirectX only)
This tells MPlayer to attach to an existing window.
Useful to embed MPlayer in a browser (e.g.\& the plugger extension).
+This option fills the given window completely, thus aspect scaling,
+panscan etc. are no longer handled by MPlayer but must be managed by the
+application that created the window.
.
.TP
.B \-xineramascreen <\-2\-...>
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index 7e2685146a..a81e1ee77c 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 r29461
+.\" sync with en/mplayer.1 r29555
.\" Encoding: UTF-8
.\" Reminder of hard terms which need better/final solution later:
.\" /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -3072,9 +3072,11 @@ ggi 和 gl2 的都支持此功能。
启用 VBI 用于 vesa, dfbmga 和 svga 视频输出驱动。
.
.TP
-.B \-wid <窗口标识> (也请参见 \-guiwid) (仅用于 X11, OpenGL 和 DirectX)
-告诉 MPlayer 附着于一个已有的窗口。
-把 MPlayer 嵌入浏览器(比如 plugger 扩展)时有用。
+.B \-wid <窗口标识>(另见 \-guiwid)(仅用于 X11、OpenGL 和 DirectX)
+该选项让 MPlayer 绑定至一个已有的窗口上。
+适用于将 MPlayer 嵌入至浏览器中(比如扩展插件)。
+该选项将完全充填所给的窗口,从而会缩放宽高比。MPlayer 不再负责诸如全景模式之类
+的功能,而是由创建该窗口的应用程序管理。
.
.TP
.B \-xineramascreen <\-2\-...>
diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt
index 6bdc2bfcfc..054e18b4f3 100644
--- a/DOCS/tech/svn-howto.txt
+++ b/DOCS/tech/svn-howto.txt
@@ -104,7 +104,7 @@ I. BASICS:
For cosmetics-only commits you should get (almost) empty output from
- svn diff --diff-cmd diff -x '-duwbBE' <filename(s)>
+ svn diff -x -uwb <filename(s)>
Also check the output of