The quick red fox jumped over the lazy brown dog.

(say it 5 times:)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@223 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 59 insertions, 13 deletions

diff --git a/DOCS/CODECS b/DOCS/CODECS
index 53fd722103..11d73129f7 100644
--- a/DOCS/CODECS
+++ b/DOCS/CODECS
@@ -50,6 +50,8 @@ Problems:
   ativcr1.dll: can't load (16-bit DLL)
 - I263:  (I263)
   i263_32.drv: segfault
+- TrueMotion 2.0:  (TM20)
+  tm20dec.ax: segfault
 
 Not tested:
 
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index ead3c6ab4f..1b8392a54c 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -147,3 +147,21 @@ A: Make the mplayer binary SUID root. Become root and type the following:
 
 Q: The fsdga driver doesn't work with my xyz.avi file. Why is that?
 A: Because it only works with MPEG. (yet)
+
+Q: When using Xvideo, my Voodoo 3/Banshee says:
+   X Error of failed request:  BadAccess (attempt to access private resource
+   denied)
+    Major opcode of failed request:  147 (MIT-SHM)
+    Minor opcode of failed request:  1 (X_ShmAttach)
+    Serial number of failed request:  26
+    Current serial number in output stream:27 
+A: Your driver is old, update it.
+
+Q: When using Xvideo, I can't play DivX avis with my Voodoo 3/Banshee !
+   It says:
+    ...
+    Xvideo image format: 0x32315659 (YV12) planar
+    Xvideo image format: 0x30323449 (I420) planar
+    ...
+A: Your driver is old, update it. The new driver also supports YUY2 required
+   for DivX.
diff --git a/DOCS/example.conf b/DOCS/example.conf
index 42fe7fc377..70a2b67526 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -40,6 +40,8 @@ nosound	= nein
 
 alsa = nem
 
+ffactor = 0.75
+
 ##
 ## You can also include another configfiles
 ## Specify full path!
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 83ce95a2c5..1dea5de501 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -27,6 +27,7 @@ mplayer \- Movie Player for Linux
 .RB [ \-dsp\ device ]
 .RB [ \-pp\ quality ]
 .RB [ \-include\ configfile ]
+.RB [ \-ffactor\ number ]
 .I file
 .PP
 .SH DESCRIPTION
@@ -92,21 +93,14 @@ Maybe less/more.
 
 .I NOTE
 You can use this with OpenDivX encoding too! See ALPHA/BETA CODE section.
-.IP
-.SH KEYBOARD CONTROL
-.TP
-.I NOTE
-These keys may/may not work, depending on your video output driver.
 .TP
-	  <-  or  ->      seek backward/forward  10 seconds
-
-up or down      seek backward/forward   1 minute
+.B \-ffactor\ number
+resample alphamap of the font. Can be:
 
-p or SPACE      pause movie (press any key)
-
-q or ESC        stop playing and quit program
-
-+ or -          adjust audio delay by +/- 0.1 second
+        0    plain white fonts
+        0.75 very narrow black outline [default]
+        1    narrow black outline
+        10   bold black outline
 .IP
 .SH "ADVANCED OPTIONS"
 .TP
@@ -169,6 +163,36 @@ Specifies the bitrate to encode OpenDivx at
 used with '-vo odivx' .
 Specifies the output OpenDivX file. Won't overwrite.
 .IP
+.SH KEYBOARD CONTROL
+.TP
+.I NOTE
+These keys may/may not work, depending on your video output driver.
+.TP
+	  <-  or  ->      seek backward/forward  10 seconds
+
+up or down      seek backward/forward   1 minute
+
+p or SPACE      pause movie (press any key)
+
+q or ESC        stop playing and quit program
+
++ or -          adjust audio delay by +/- 0.1 second
+.IP
+.SH FILES AND DIRECTORIES
+.TP
+.I CONFIG FILES
+Settings are stored system-wide in the /etc/mplayer.conf file,
+and per-user in $HOME/.mplayer/config. The directory
+$HOME/.mplayer and the 'config' are created if doesn't exist.
+.TP
+.I FONTS
+Fonts are searched in $HOME/.mplayer/font. There must be a font.desc
+file, and files with .RAW extension.
+.TP
+.I SUB FILES
+Sub files are searched in $HOME/.mplayer/sub, and in the directory
+of the movie.
+.IP
 .SH "EXAMPLES"
 Just launch it! :)
 .LP