[Mplayer-cvslog] CVS: main/DOCS documentation.html,1.157,1.158 encoding.html,1.19,1.20 mplayer.1,1.123,1.124

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/DOCS
In directory mplayer:/var/tmp.root/cvs-serv2979

Modified Files:
	documentation.html encoding.html mplayer.1 
Log Message:
stuff.


Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- documentation.html	30 Dec 2001 16:43:08 -0000	1.157
+++ documentation.html	31 Dec 2001 01:12:54 -0000	1.158
@@ -494,6 +494,11 @@
     make
     make install</PRE>
 
+<P>At this point, <B>MPlayer</B> is ready to use. The directory
+<CODE>/usr/local/share/mplayer</CODE> contains the <CODE>codecs.conf</CODE>
+file, which is used to tell the program all the codecs and their capabilities.
+This file should always be kept uptodate together with the main binary !</P>
+
 <P><B>Debian users</B> can build a .deb package for themselves, it's very
 simple. Just exec <CODE>fakeroot debian/rules binary</CODE> in <B>MPlayer</B>'s
 root dir. Detailed instructions can be found <A HREF="documentation.html#6.1">here</A>.</P>
@@ -511,11 +516,6 @@
     cd ~/.mplayer/font
     unzip mp-arial-iso-8859-1.zip</PRE>
 
-<P>Only one thing remains: copy the <B>codecs.conf</B> file from the <CODE>etc</CODE>
-directory (relative to the <B>MPlayer</B> tree) to <CODE>$HOME/.mplayer/codecs.conf</CODE> .
-You should also check the manpage and <CODE>example.conf</CODE> for available options, and insert them
-into your config file, <CODE>$HOME/.mplayer/config</CODE> .</P>
-
 
 <P><B><A NAME=1.4>1.4. What about the GUI?</A></B></P>
 
@@ -530,6 +530,9 @@
   and call <CODE>gmplayer</CODE> instead.
 </UL>
 </P>
+
+<P>HINT: use the middle button (on 2 button mice press left and right
+simultaneously) for a popup GTK menu, with DVD playing option!</P>
 
 <P>As <B>MPlayer</B> doesn't have a skin included, you have to download them
 if you want to use the GUI. See the <A HREF="http://www.mplayerhq.hu/homepage/dload.html">download page</A>.

Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- encoding.html	28 Dec 2001 22:14:06 -0000	1.19
+++ encoding.html	31 Dec 2001 01:12:54 -0000	1.20
@@ -101,7 +101,7 @@
   AVI (DivX) files, you have be aware that AVI headers don't store this
   value. Thus, the only solution is rescaling.</P>
 
-<P><B>MEncoder can scale input images if they come in YV12 format (for example:
+<P><B>MEncoder</B> can scale input images if they come in YV12 format (for example:
   ffdivx, odivx drivers, or mpeg1/2). The output size is specified with the
   <CODE>-x</CODE>, and <CODE>-y</CODE> options.  Furthermore, there are 3
   rescaling filters in <B>MEncoder</B>, <I>0
@@ -141,9 +141,9 @@
 
 <P><B><A NAME=2.4.3.5>2.4.3.5.  Encoding with the <I>libavcodec</I> codec family</B></P>
 
-<P>libavcodec provides simple encoding to a lot of interesting video and audio
-formats (currently its audio codecs are unsupported). You can encode to the
-following codecs :</P>
+<P><A HREF="codecs.html#2.2.1.2">libavcodec</A> also provides simple encoding
+to a lot of interesting video and audio formats (currently its audio codecs are
+unsupported by us). Currently you can encode to the following codecs :</P>
 
 <P>
 <UL>
@@ -159,6 +159,9 @@
 
 <P>The first column contains the codec names that should be passed after the
   <CODE>vcodec</CODE> config, like : <CODE>-lavcopts vcodec=msmpeg4</CODE></P>
+
+<P>An example, with MJPEG compression :<BR>
+  <CODE>&nbsp;&nbsp;&nbsp;&nbsp;mencoder -dvd 2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -ffourcc mjpg</CODE></P>
 
 <P><B><A NAME=2.4.4>2.4.4.  Syntax</B></P>
 

Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mplayer.1	28 Dec 2001 21:23:44 -0000	1.123
+++ mplayer.1	31 Dec 2001 01:12:54 -0000	1.124
@@ -101,6 +101,7 @@
 .RB [ \-tv\ suboptions ]
 .RB [ \-dapsync ]
 .RB [ \-softsleep ]
+.RB [ \-rootwin ]
 .I < - | file | URL | device >
 .PP
 .SH DESCRIPTION
@@ -312,6 +313,10 @@
 .B \-tv\ suboptions
 this option enables the TV grabbing feature of MPlayer. For complete
 documentation, please see documentation.html chapter 2.5
+.TP
+.B \-rootwin
+play movie in the root window (desktop background) instead of opening
+a new one. Works only with the xv and xmga drivers.
 .IP
 .SH "ADVANCED OPTIONS"
 .TP