summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-20 19:57:09 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-20 19:57:09 +0000
commitfc76820d0099580411502489ec4d85d49f7d9839 (patch)
treedd678dfb034afd136f96add51473c921ce964b27 /DOCS
parentf0bff0895f7dd66d4856b3fcb808bdbbca61547a (diff)
downloadmpv-fc76820d0099580411502489ec4d85d49f7d9839.tar.bz2
mpv-fc76820d0099580411502489ec4d85d49f7d9839.tar.xz
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) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16542 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/encoding-guide.xml31
-rw-r--r--DOCS/xml/en/mencoder.xml6
2 files changed, 28 insertions, 9 deletions
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index 2804bf314d..2d84edf7ef 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -2217,7 +2217,12 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
<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 @@ You can encode to the following codecs (more or less up to date):
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 @@ The first column contains the codec names that should be passed after the
<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 @@ The first column contains the codec names that should be passed after the
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>
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 42e6becbc9..1e4d51bc1d 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -38,7 +38,8 @@ Audio Codecs:
</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 @@ Video codecs:
<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>