summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en/mplayer.1
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/man/en/mplayer.1
parenta9618c1c6fe9424dfaeb1677348e0382d7252554 (diff)
parentdcfd043ea8d0c46929aad78596314d837c290d39 (diff)
downloadmpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2
mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz
Merge svn changes up to r29644
Diffstat (limited to 'DOCS/man/en/mplayer.1')
-rw-r--r--DOCS/man/en/mplayer.18
1 files changed, 8 insertions, 0 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\-...>