[Mplayer-cvslog] CVS: main/DOCS encoding.html,1.30,1.31 mencoder.1,1.30,1.31

[Winner of tha face compo]

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

Modified Files:
	encoding.html mencoder.1 
Log Message:
-audiofile


Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- encoding.html	7 Mar 2002 17:55:33 -0000	1.30
+++ encoding.html	8 Mar 2002 17:37:25 -0000	1.31
@@ -62,6 +62,7 @@
       <A HREF=codecs.html#2.2.1.2>libavcodec</A></LI>
     <LI>video encoding from <B>V4L compatible TV tuners</B></LI>
     <LI>encoding/multiplexing to interleaved AVI files with proper index</LI>
+    <LI>creating files from external audio stream</LI>
     <LI>1, 2 or 3 pass <B>DivX4</B> video</LI>
     <LI><B>VBR</B> MP3 audio - <B>IMPORTANT NOTE</B> : VBR MP3 audio doesn't
       always play nicely on windows players! If you intend to encode AVIs
@@ -77,10 +78,9 @@
 
 <P><B><I>Planned features</I></B> :
   <UL>
-    <LI>using audio from separate file (AC3, MP3, OGG)</LI>
     <LI>even wider variety of available en/decoding formats/codecs
     (creating VOB files with DivX4/Indeo5/VIVO streams :)</LI>
-    <LI>audio encoding from v4l</LI>
+    <LI>audio encoding from v4l (DONE for FreeBSD ?)</LI>
   </UL>
 </P>
 
@@ -197,7 +197,10 @@
   example when only the audio stream has to be encoded (like, uncompressed PCM
   to MP3).</LI>
 
-  <LI><B>Audio stream</B> (option <CODE>-oac copy</CODE>) : straightforward.</LI>
+  <LI><B>Audio stream</B> (option <CODE>-oac copy</CODE>) : straightforward.
+  It is possible to take an external audio file (MP3, AC3, Vorbis) and mux it
+  into the output stream. Use the <CODE>-audiofile &lt;filename&gt;</CODE>
+  option for this.</LI>
 </UL>
 </P>
 

Index: mencoder.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mencoder.1,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mencoder.1	3 Mar 2002 10:54:03 -0000	1.30
+++ mencoder.1	8 Mar 2002 17:37:25 -0000	1.31
@@ -41,6 +41,7 @@
 .RB [ \-ffourcc\ fourcc ]
 .RB [ \-ss\ <time> ]
 .RB [ \-endpos\ <time> ]
+.RB [ \-audiofile\ <file\ name> ]
 .I - or file or files specified with escaped wildcard or device
 .PP
 .SH DESCRIPTION
@@ -140,6 +141,9 @@
   -oac copy      no encoding, just streamcopy
   -oac pcm       encode to uncompressed PCM
   -oac mp3lame   encode to MP3 (using Lame)
+.TP
+.B \-audiofile <file name>
+Copy audio from external file.
 .TP
 .B \-mf <multifile options>
 Used when encoding from multiple JPEG files.