*** empty log message ***

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

2 files changed, 24 insertions, 2 deletions

diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 50cca873d6..b6687b56ca 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -1599,6 +1599,10 @@ Table of Contents
      Also, open the possibility to play DivX on virtually every computer that
      has a C compiler. Kinda great stuff, isn't it?
 
+  <B>Q: But configure tells me "Checking for libavcodec ... no"!
+  </B>A: You need to get libavcodec from FFmpeg's CVS. Read the instructions in
+     the <A HREF="#2.1.2.2">ffmpeg section</A> .
+
 
   <A NAME=6.3>6.3.  File playing problems
 
@@ -1823,6 +1827,8 @@ Table of Contents
 
   To run <B>MPlayer</B> you will need to re-compile the kernel with 
   "options USER_LDT" (unless you are running -CURRENT, where this is default).
+  If you have a CPU with SSE also use "options CPU_ENABLE_SSE" to use it
+  (FreeBSD-STABLE required, or use kernel patches).
 
   If <B>MPlayer</B> complains about "CD-ROM Device '/dev/cdrom' not found!" make a 
   symbolic link : ln -s /dev/(your_cdrom_device) /dev/cdrom 
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 57009c4e57..aa88d2b5f2 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -65,6 +65,7 @@ mplayer \- Movie Player for Linux
 .RB [ \-fb\ device ]
 .RB [ \-fbmode\ modename ]
 .RB [ \-fbmodeconfig filename ]
+.RB [ \-benchmark ]
 .I - or file
 .PP
 .SH DESCRIPTION
@@ -141,6 +142,7 @@ The supported formats and settings are:
 
         MPEG 1/2   0 (none), 1, 3, 7, 15, 31, 63
         OpenDivX   0 (none), 1, 3, 7, 15, 31, 63
+        DivX4      0 (none) - 60
         DivX       0 (none), 1, 2, 3, 4
 
 .I NOTE
@@ -178,11 +180,14 @@ specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
 .B \-lircconf\ configfile
 specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc 
 .TP
-.B \-v\
+.B \-v
 enable verbose output (more -v means more verbose)
 .TP
-.B \-quiet\
+.B \-quiet
 display less output, status messages.
+.TP
+.B \-benchmark
+used in combination with -nosound and -vo null for benchmarking.
 .IP
 .SH "ADVANCED OPTIONS"
 .TP
@@ -401,6 +406,17 @@ o               toggle OSD: none / seek / seek+timer
 m               toggle using master/pcm volume
 
 z or x          adjust subtitle delay by +/- 0.1 second
+
+(the following keys are valid only when using DirectShow DivX codec)
+
+1 or 2          adjust contrast
+
+3 or 4          adjust brightness
+
+5 or 6          adjust ?
+
+7 or 8          adjust saturation
+
 .IP
 .SH FILES AND DIRECTORIES
 .TP