CVS change done by Guillaume Poirier CVS Update of /cvsroot/mplayer/main/DOCS/xml/en In directory mail:/var2/tmp/cvs-serv6845/en Modified Files: mencoder.xml encoding-guide.xml Log Message: add some internal links between "codecs supported by mencoder" and "codecs featured by lavc". Added an audio encoding example. Moved the "codecs featured by lavc" in 2 shiny new sections (to allow the internal links to work) Index: mencoder.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/mencoder.xml,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- mencoder.xml 19 Sep 2005 21:42:00 -0000 1.89 +++ mencoder.xml 20 Sep 2005 19:57:09 -0000 1.90 @@ -38,7 +38,8 @@ </row> <row> <entry>lavc</entry> - <entry>Use one of libavcodec's audio encoders</entry> + <entry>Use one of <link linkend="menc-feat-enc-libavcodec-audio-codecs"><systemitem class="library">libavcodec</systemitem>'s audio codecs</link> + </entry> </row> <row> <entry>faac</entry> @@ -75,7 +76,8 @@ <tbody> <row> <entry>lavc</entry> - <entry>Use one of libavcodec's video encoders</entry> + <entry>Use one of <link linkend="menc-feat-enc-libavcodec-video-codecs"><systemitem class="library">libavcodec</systemitem>'s video codecs</link> + </entry> </row> <row> <entry>xvid</entry> Index: encoding-guide.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/encoding-guide.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- encoding-guide.xml 19 Sep 2005 23:09:40 -0000 1.23 +++ encoding-guide.xml 20 Sep 2005 19:57:09 -0000 1.24 @@ -2217,7 +2217,12 @@ <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link> provides simple encoding to a lot of interesting video and audio formats. You can encode to the following codecs (more or less up to date): +</para> + +<sect2 id="menc-feat-enc-libavcodec-video-codecs"> +<title><systemitem class="library">libavcodec</systemitem>'s video codecs</title> +<para> <informaltable frame="all"> <tgroup cols="2"> <thead> @@ -2290,8 +2295,18 @@ The first column contains the codec names that should be passed after the <literal>vcodec</literal> config, like: <option>-lavcopts vcodec=msmpeg4</option> +</para> +<informalexample> +<para> +An example, with MJPEG compression: +<screen>mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -oac copy</screen> +</para> +</informalexample> +</sect2> - +<sect2 id="menc-feat-enc-libavcodec-audio-codecs"> +<title><systemitem class="library">libavcodec</systemitem>'s audio codecs</title> +<para> <informaltable frame="all"> <tgroup cols="2"> <thead> @@ -2322,6 +2337,13 @@ <literal>acodec</literal> option, like: <option>-lavcopts acodec=ac3</option> </para> +<informalexample> +<para> +An example, with AC3 compression: +<screen>mencoder dvd://2 -o title2.avi -oac lavc -lavcopts acodec=ac3 -ovc copy</screen> +</para> +</informalexample> + <para> Contrary to <systemitem class="library">libavcodec</systemitem>'s video codecs, its audio codecs do not make a wise usage of the bits they are @@ -2332,13 +2354,8 @@ compiled with <systemitem class="library">libavcodec</systemitem> (which is the case most of time), and do not depend on external libraries. </para> +</sect2> -<informalexample> -<para> -An example, with MJPEG compression: -<screen>mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vcodec=mjpeg -oac copy</screen> -</para> -</informalexample> <sect2 id="menc-feat-dvd-mpeg4-lavc-encoding-options"> <title>Encoding options of libavcodec</title>