strike period over, commiting stuff. next commit will be rewrite. (?)

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

1 files changed, 9 insertions, 1 deletions

diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 877693bbbd..48c8cd3c73 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -109,6 +109,7 @@ mplayer \- Movie Player for Linux
 .RB [ \-softsleep ]
 .RB [ \-rootwin ]
 .RB [ \-font\ <path\ to\ font.desc\ file> ]
+.RB [ \-conf\ <path\ to\ input.conf\ file> ]
 .I < - | file | URL | device >
 .PP
 .SH DESCRIPTION
@@ -245,6 +246,9 @@ hardware acceleration. Possible settings are :
     0 - fast bilinear (default)
     1 - bilinear
     2 - bicubic (best quality)
+    3 - ?
+    4 - nearest neighbor (bad quality)
+    5 - area averageing scaling support
 .TP
 .B \-xy\ <factor>
 scale image by <factor>
@@ -314,7 +318,7 @@ set aspect ratio of your screen. Examples:
 
 .TP
 .B \-playlist <file>
-play files according to this filelist (1 file/row or ASX format).
+play files according to this filelist (1 file/row or Winamp or ASX format).
 .TP
 .B \-ss\ <time>
 seek to given time position. For example :
@@ -347,6 +351,10 @@ search for the OSD/SUB fonts in an alternative directory (default :
 ~/.mplayer/font/font.desc). For example:
 
     -font ~/.mplayer/arial-14/font.desc
+.TP
+.B \-conf\ <path\ to\ input.conf\ file>
+get input bindings from an alternative input.conf file (default :
+~/.mplayer/input.conf).
 .IP
 .SH "ADVANCED OPTIONS"
 .TP