[Mplayer-cvslog] CVS: main/DOCS codecs.html,1.58,1.59 documentation.html,1.212,1.213 encoding.html,1.34,1.35 formats.html,1.18,1.19 video.html,1.73,1.74

Thu Mar 28 18:30:48 CET 2002

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

Modified Files:
	codecs.html documentation.html encoding.html formats.html 
	video.html 
Log Message:
small update


Index: codecs.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/codecs.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59

--- codecs.html	20 Mar 2002 20:25:43 -0000	1.58
+++ codecs.html	28 Mar 2002 17:30:37 -0000	1.59
@@ -150,16 +150,8 @@
 <P>Then compile. configure detects if it's alright, and can be compiled. The
 codec also <B>supports postprocessing!</B></P>
 
-<P>In order to use it, update your codecs.conf file, and do as the manpage,
-or the example.conf says (the -vfm option).</P>
-
-<P>To achieve the <B>greatest speed</B> on my K6, I remove the
-<CODE>ffmpeg12</CODE> section from codecs.conf (this codec isn't optimized, and
-libmpeg2 is twice as fast), and place <CODE>vfm=5</CODE> in my config file.
-Then <B>MPlayer</B> always uses <B>ffdivx/ffodivx</B> to decode
-<B>DivX</B> files, and libmpeg2 for MPEG1/2 . With this and my
-Matrox G400, I can view even the highest resolution DivX movies on my
-K6/2 500, without framedrop.</P>
+<P>With ffmpeg and my Matrox G400, I can view even the highest resolution DivX
+  movies on my K6/2 500, without dropped frames.</P>
 
 
 <P><B><A NAME=2.2.1.3>2.2.1.3.  XAnim codecs</A></B></P>

Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- documentation.html	23 Mar 2002 10:47:13 -0000	1.212
+++ documentation.html	28 Mar 2002 17:30:37 -0000	1.213
@@ -58,6 +58,13 @@
         <LI><A HREF="formats.html#2.1.1.11">2.1.1.11 RoQ files</A></LI>
       </UL>
       <LI><A HREF="formats.html#2.1.2">2.1.2 Audio</A></LI>
+      <UL>
+        <LI><A HREF="formats.html#2.1.2.1">2.1.2.1 MP3 files</A></LI>
+        <LI><A HREF="formats.html#2.1.2.2">2.1.2.2 WAV files</A></LI>
+        <LI><A HREF="formats.html#2.1.2.3">2.1.2.3 OGG files (Vorbis)</A></LI>
+        <LI><A HREF="formats.html#2.1.1.3">2.1.2.4 WMA/ASF files</A></LI>
+        <LI><A HREF="formats.html#2.1.2.5">2.1.2.5 MP4 files</A></LI>
+      </UL>
     </UL>
     <LI><A HREF="codecs.html#2.2">2.2 Supported codecs</A></LI>
     <UL>

Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- encoding.html	13 Mar 2002 15:33:55 -0000	1.34
+++ encoding.html	28 Mar 2002 17:30:37 -0000	1.35
@@ -272,6 +272,10 @@
   &nbsp;&nbsp;<CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -o
   output.avi</CODE></P>
 
+<P><I>Creating a DivX4 file from some JPEG files in the current dir :</I><BR>
+  &nbsp;&nbsp;<CODE>mencoder frame001.jpg,frame002.jpg -mf on:w=800:h=600:fps=25 -ovc divx4 -o
+  output.avi</CODE></P>
+
 <P><I>Creating a Motion JPEG (MJPEG) file from all the JPEG files in the current dir :</I><BR>
   &nbsp;&nbsp;<CODE>mencoder \*.jpg -mf on:w=800:h=600:fps=25 -ovc copy
   -o output.avi</CODE></P>

Index: formats.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/formats.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- formats.html	27 Mar 2002 00:54:45 -0000	1.18
+++ formats.html	28 Mar 2002 17:30:37 -0000	1.19
@@ -198,17 +198,33 @@
 
 <P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>
 
-<P><B>MPlayer</B> used to be a <B>Movie</B> and not a <B>Media</B> player.
-This is slowly changing and MP3, OGG VORBIS, WMA, MP4 and WAV are currently
-supported. Nevertheless the main focus is still video, so you may prefer to
-use alternatives like <A HREF="http://www.xmms.org">xmms</A> or 
-<A HREF="http://www.mpg123.de">mpg123</A> instead.</P>
+<P><B>MPlayer</B> is a <B>Movie</B> and not a <B>Media</B> player, although
+  it can play some audio file formats (they are listed in the sections below).
+  This is not a recommended usage of <B>MPlayer</B>, you better use
+  <A HREF="http://www.xmms.org">xmms</A>.</P>
+
+
+<P><B><A NAME=2.1.2.1>2.1.2.1. MP3 files</A></B></P>
 
 <P>You may have problems playing certain MP3 files that <B>MPlayer</B> will
-misdetect as mpegs and play incorrectly or not at all. This cannot be fixed
-without dropping support for certain broken mpeg files and thus will remain
+misdetect as MPEGs and play incorrectly or not at all. This cannot be fixed
+without dropping support for certain broken MPEG files and thus will remain
 like this for the foreseeable future. The <CODE>-demuxer</CODE> flag described
 in the manpage may help you in these cases.</P>
+
+
+<P><B><A NAME=2.1.2.2>2.1.2.2. WAV files</A></B></P>
+
+
+<P><B><A NAME=2.1.2.3>2.1.2.3. OGG files (Vorbis)</A></B></P>
+
+<P>Requires properly installed <CODE>libvorbis</CODE>.</P>
+
+
+<P><B><A NAME=2.1.2.4>2.1.2.4. WMA/ASF files</A></B></P>
+
+
+<P><B><A NAME=2.1.2.5>2.1.2.5. MP4 files</A></B></P>
 
 </BODY>
 </HTML>

Index: video.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/video.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- video.html	26 Mar 2002 16:56:24 -0000	1.73
+++ video.html	28 Mar 2002 17:30:37 -0000	1.74
@@ -194,15 +194,18 @@
   X 4.2.0 can't do Xv, but we have a modified, Xv-capable driver for you.
   <A HREF="http://www.mplayerhq.hu/MPlayer/contrib/NeoMagic-driver/neomagic_drv.o.4.2.0.bz2">Download from here</A>.
   Driver provided by Stefan Seyfried.</P>
-<P>To allow playback of DVD sized change your XF86Config like this:<BR>
-<BR>
+
+<P>To allow playback of DVD sized content change your XF86Config like this :</P>
+
+<P>
 Section "Device"<BR>
 &nbsp; &nbsp; <I>[...]</I><BR>
 &nbsp; &nbsp; Driver "neomagic"<BR>
 &nbsp; &nbsp; <B>Option "OverlayMem" "829440"</B><BR>
 &nbsp; &nbsp; <I>[...]</I><BR>
-EndSection<BR>
+EndSection
 </P>
+
 
 <P><B><A NAME=2.3.1.2.6>2.3.1.2.6. Trident cards</A></B></P>
 


