# HG changeset patch
# User diego
# Date 1074713118 0
# Node ID 359eaf957bf1d697fd4e86db23a51d7f4f485669
# Parent  43f35b915dc79357e54c1a1b0e7a5b731dc20a7c
Add <systemitem class="library"> tags to libavcodec and a few others.

diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/codecs.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -56,7 +56,8 @@
   FLI/FLC
   </simpara></listitem>
 <listitem><simpara>
-  <emphasis role="bold">RealVideo 1.0 &amp; 2.0</emphasis> from libavcodec, and
+  <emphasis role="bold">RealVideo 1.0 &amp; 2.0</emphasis> from
+  <systemitem class="library">libavcodec</systemitem>, and
   <emphasis role="bold">RealVideo 3.0 &amp; 4.0</emphasis> codecs using RealPlayer
   libraries
   </simpara></listitem>
@@ -91,9 +92,10 @@
 <para>
 The new generation of this codec is called DivX4 and can even decode
 movies made with the infamous DivX codec! In addition it is much faster
-than the native Win32 DivX DLLs but slower than <systemitem
-class="library">libavcodec</systemitem>.  Hence its usage as a decoder is
-<emphasis role="bold">DISCOURAGED</emphasis>. However, it is useful for
+than the native Win32 DivX DLLs but slower than
+<systemitem class="library">libavcodec</systemitem>.
+Hence its usage as a decoder is
+<emphasis role="bold">discouraged</emphasis>. However, it is useful for
 encoding. One disadvantage of this codec is that it is not available under an
 Open Source license.
 </para>
@@ -219,9 +221,11 @@
 </para>
 
 <para>
-If you use an <application>MPlayer</application> release you have libavcodec
+If you use an <application>MPlayer</application> release you have
+<systemitem class="library">libavcodec</systemitem>
 right in the package, just build  as usual. If you use
-<application>MPlayer</application> from CVS you have to extract libavcodec from
+<application>MPlayer</application> from CVS you have to extract
+<systemitem class="library">libavcodec</systemitem> from
 the FFmpeg CVS tree as FFmpeg releases are very rare. The CVS is mostly stable
 and offers the most features. In order to achieve this do:
 </para>
@@ -243,7 +247,8 @@
   copy/move it!
   </para></step>
 <step><para>
-  If you prefer having libavcodec updated at the same time you update
+  If you prefer having <systemitem class="library">libavcodec</systemitem>
+  updated at the same time you update
   <application>MPlayer</application> CVS, put the following line into the
   <filename>main/CVS/Entries</filename> file:
   <screen>D/libavcodec////</screen>
@@ -258,7 +263,8 @@
 <para>
 <application>MPlayer</application> from CVS does contain a
 <filename>libavcodec</filename> subdirectory, but it does
-<emphasis role="bold">not</emphasis> contain the source for libavcodec!
+<emphasis role="bold">not</emphasis> contain the source for
+<systemitem class="library">libavcodec</systemitem>!
 You must follow the steps above to obtain the source for this library.
 </para>
 </note>
@@ -457,7 +463,8 @@
 <title>DISADVANTAGES</title>
 <listitem><simpara>
   currently it does not properly <emphasis role="bold">decode</emphasis> all
-  DivX/DivX4 files (no problem as <link linkend="ffmpeg">libavcodec</link>
+  DivX/DivX4 files (no problem as
+  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
   can play them)
   </simpara></listitem>
 <listitem><simpara>
@@ -519,12 +526,12 @@
 <listitem><simpara>
   Sorenson Video v1 (fourcc <emphasis>SVQ1</emphasis>) - decoding supported
   by <emphasis role="bold">native codec</emphasis>
-  (<link linkend="ffmpeg">libavcodec</link>)
+  (<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
   </simpara></listitem>
 <listitem><simpara>
   Sorenson Video v3 (fourcc <emphasis>SVQ3</emphasis>) - decoding supported by
   <emphasis role="bold">native codec</emphasis>
-  (<link linkend="ffmpeg">libavcodec</link>)
+  (<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
   </simpara></listitem>
 </itemizedlist>
 
@@ -557,7 +564,7 @@
   </simpara></listitem>
 <listitem><simpara>
   Windows Media Audio 7 and 8 (aka WMAv1 and WMAv2) (<emphasis role="bold">native</emphasis> code, with
-  <link linkend="ffmpeg">libavcodec</link>)
+  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
   </simpara></listitem>
 <listitem><simpara>
   Windows Media Audio 9 (WMAv3) (using DMO DLL)
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/documentation.xml
--- a/DOCS/xml/en/documentation.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/documentation.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -92,7 +92,8 @@
 (<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>)
 to other <application>MPlayer</application>-playable formats (see below). It
 can encode with various codecs, like <emphasis role="bold">DivX4</emphasis>
-(1 or 2 passes), libavcodec, <emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
+(1 or 2 passes), <systemitem class="library">libavcodec</systemitem>,
+<emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
 audio. Also has powerful plugin system for video manipulation.
 </para>
 
@@ -104,8 +105,8 @@
   <application>MPlayer</application>
   </simpara></listitem>
 <listitem><simpara>
-  Encoding to all the codecs of ffmpeg's <link
-  linkend="ffmpeg">libavcodec</link>
+  Encoding to all the codecs of FFmpeg's
+  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
   </simpara></listitem>
 <listitem><simpara>
   Video encoding from <emphasis role="bold">V4L compatible TV tuners</emphasis>
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/faq.xml
--- a/DOCS/xml/en/faq.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/faq.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -549,10 +549,12 @@
 
 <qandaentry>
 <question><para>
-What exactly is this libavcodec thing?
+What exactly is this <systemitem class="library">libavcodec</systemitem> thing?
 </para></question>
 <answer><para>
-See the <link linkend="ffmpeg">libavcodec</link> section.
+See the
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+section.
 </para></answer>
 </qandaentry>
 
@@ -562,8 +564,10 @@
 <screen>Checking for libavcodec ... no</screen>
 </para></question>
 <answer><para>
-You need to get libavcodec from FFmpeg's CVS. Read the instructions in the
-<link linkend="ffmpeg">libavcodec</link> section.
+You need to get <systemitem class="library">libavcodec</systemitem> from
+FFmpeg's CVS. Read the instructions in the
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+section.
 </para></answer>
 </qandaentry>
 
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/install.xml
--- a/DOCS/xml/en/install.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/install.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -126,7 +126,8 @@
 
 <itemizedlist>
 <listitem><para>
-  <emphasis role="bold">libavcodec</emphasis>: This codec package is capable
+  <emphasis role="bold"><systemitem class="library">libavcodec</systemitem></emphasis>:
+  This codec package is capable
   of decoding H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/SVQ1/SVQ3 encoded video
   streams and WMA (Windows Media Audio) v1/v2 audio streams, on multiple
   platforms. It is also known to be the fastest for this task. See
@@ -169,7 +170,9 @@
   <listitem><simpara>
     Not needed for old ASF's with MP41 or MP42 video (though VoxWare audio is
     frequent for these files - it's done by the Win32 codec), or WMV7. Also not
-    needed for WMA (Windows Media Audio), libavcodec has opensource decoder for that.
+    needed for WMA (Windows Media Audio),
+    <systemitem class="library">libavcodec</systemitem> has open source decoder
+    for that.
     </simpara></listitem>
   </itemizedlist>
   </para></listitem>
@@ -182,8 +185,9 @@
 <listitem><para>
   <emphasis role="bold">DivX4/DivX5</emphasis>: information about this codec is
   available in the <link linkend="divx4-5">DivX4/DivX5</link> section. You possibly
-  don't want this codec as <emphasis role="bold">libavcodec</emphasis> (see
-  above) is much faster and has better quality than this, for both decoding
+  don't want this codec as
+  <emphasis role="bold"><systemitem class="library">libavcodec</systemitem></emphasis>
+  (see above) is much faster and has better quality than this, for both decoding
   and encoding. Features:
   <itemizedlist>
   <listitem><simpara>
@@ -192,7 +196,8 @@
     </simpara></listitem>
   <listitem><simpara>
     can play old <emphasis role="bold">DivX3</emphasis> movies much faster than
-    the Win32 DLL but slower than <emphasis role="bold">libavcodec</emphasis>!
+    the Win32 DLL but slower than
+    <emphasis role="bold"><systemitem class="library">libavcodec</systemitem></emphasis>!
     </simpara></listitem>
   <listitem><simpara>
     it's closed-source, and only a x86 version is available.
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/mencoder.xml
--- a/DOCS/xml/en/mencoder.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/mencoder.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -109,7 +109,8 @@
 <title>Encoding to MPEG format</title>
 <para>
 <application>MEncoder</application> can create MPEG (MPEG-PS) format output
-files. It's probably useful only with <link linkend="ffmpeg">libavcodec</link>'s
+files. It's probably useful only with
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>'s
 <emphasis>mpeg1video</emphasis> codec, because players - except
 <application>MPlayer</application> - expect MPEG1 video, and MPEG1 layer 2 (MP2)
 audio streams in MPEG files.
@@ -234,11 +235,12 @@
 </sect1>
 
 <sect1 id="menc-feat-enc-libavcodec">
-<title>Encoding with the libavcodec codec family</title>
+<title>Encoding with the <systemitem class="library">libavcodec</systemitem>
+  codec family</title>
 
 <para>
-<link linkend="ffmpeg">libavcodec</link> provides simple encoding to a lot
-of interesting video and audio formats.
+<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):
 
 <informaltable frame="all">
@@ -485,7 +487,8 @@
 </para>
 
 <para>
-This feature can be used only with <link linkend="ffmpeg">libavcodec</link>'s
+This feature can be used only with
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>'s
 <systemitem>mpeg4</systemitem> codec. Keep in mind: although
 <application>MPlayer</application> will correctly play the created file,
 other players will use the wrong aspect ratio.
@@ -506,9 +509,10 @@
 <sect1 id="custommatrices"><title>Custom inter/intra matrices</title>
 
 <para>
-With this feature of <link linkend="ffmpeg">libavcodec</link> you are
-able to set custom inter (I-frames/key frames) and intra (P-frames/predicted
-frames) matrices. It is supported by many of the codecs:
+With this feature of
+<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>
+you are able to set custom inter (I-frames/key frames) and intra
+(P-frames/predicted frames) matrices. It is supported by many of the codecs:
 <systemitem>mpeg1video</systemitem> and <systemitem>mpeg2video</systemitem>
 are reported as working.
 </para>
@@ -575,7 +579,8 @@
   Ripping a DVD title into a maximally high quality MPEG4 (DivX) file
   involves many considerations. Below is an example of the process when
   there is no file size goal (other than perhaps fitting the result into 2GB).
-  <systemitem class="library">libavcodec</systemitem> will be used for the video,
+  <systemitem class="library"><systemitem class="library">libavcodec</systemitem></systemitem>
+  will be used for the video,
   and the audio will be copied as is without any changes.
 </para>
 
@@ -602,8 +607,8 @@
   quantizing AKA constant quality is a good choice. That way each frame
   is given as much bits as its needs to keep the quality at the desired
   level, but multiple encoding passes are not needed. With
-  <systemitem class="library">libavcodec</systemitem>, you get constant
-  quality by using
+  <systemitem class="library"><systemitem class="library">libavcodec</systemitem></systemitem>,
+  you get constant quality by using
   <option>-lavcopts vqscale=<replaceable>N</replaceable></option>.
   <option>vqscale=3</option> should give you a file below 2GB in size,
   depending mainly on the movie length and video noisiness (the more
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/ports.xml
--- a/DOCS/xml/en/ports.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/ports.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -55,11 +55,12 @@
 Compaq Ipaq. The easiest way to obtain <application>MPlayer</application> is to get it
 from one of the <ulink url="http://www.openzaurus.org">OpenZaurus</ulink> package feeds. If
 you want to compile it yourself, you should look at the
-<ulink url="http://openzaurus.bkbits.net:8080/buildroot/src/packages/mplayer?nav=index.html|src/.|src/packages">MPlayer</ulink>
+<ulink url="http://openzaurus.bkbits.net:8080/buildroot/src/packages/mplayer?nav=index.html|src/.|src/packages">mplayer</ulink>
 and the
 <ulink url="http://openzaurus.bkbits.net:8080/buildroot/src/packages/libavcodec?nav=index.html|src/.|src/packages">libavcodec</ulink>
 directory in the OpenZaurus distribution buildroot. These always have the latest
-Makefile and patches used for building a CVS <application>MPlayer</application> with libavcodec.
+Makefile and patches used for building a CVS <application>MPlayer</application> with
+<systemitem class="library">libavcodec</systemitem>.
 If you need a GUI frontend, you can use xmms-embedded.
 </para>
 </sect2>
@@ -128,10 +129,14 @@
 <para>
 On <emphasis role="bold">UltraSPARCs</emphasis>, <application>MPlayer</application>
 takes advantage of their <emphasis role="bold">VIS</emphasis> extensions
-(equivalent to MMX), currently only in <emphasis>libmpeg2</emphasis>, <emphasis>libvo</emphasis>
-and <emphasis>libavcodec</emphasis>, but not in mp3lib. You can watch a VOB file
+(equivalent to MMX), currently only in
+<systemitem class="library">libmpeg2</systemitem>,
+<systemitem class="library">libvo</systemitem>
+and <systemitem class="library">libavcodec</systemitem>, but not in
+<systemitem class="library">mp3lib</systemitem>. You can watch a VOB file
 on a 400MHz CPU. You'll need
-<ulink url="http://www.sun.com/sparc/vis/mediaLib.html">mLib</ulink> installed.
+<ulink url="http://www.sun.com/sparc/vis/mediaLib.html"><systemitem class="library">mLib</systemitem></ulink>
+installed.
 </para>
 
 <para>
@@ -386,7 +391,8 @@
 
 <para>
 Apple's modified GCC 3.x is preferred for compiling
-<application>MPlayer</application> especially when using libavcodec as Apple's
+<application>MPlayer</application> especially when using
+<systemitem class="library">libavcodec</systemitem> as Apple's
 modified GCC 2.95.x doesn't support C99 syntax well.
 </para>
 
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/tvinput.xml
--- a/DOCS/xml/en/tvinput.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/tvinput.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -107,7 +107,8 @@
 <application>MEncoder</application> it was necessary to specify the output
 format. This issue should be fixed in the current releases and <option>outfmt</option>
 isn't required anymore, and the default suits the most purposes. For example,
-if you are capturing into DivX using libavcodec and specify
+if you are capturing into DivX using
+<systemitem class="library">libavcodec</systemitem> and specify
 <option>outfmt=RGB24</option> in order to increase the quality of the captured
 images, the captured image will be actually later converted back into YV12 so
 the only thing you achieve is a massive waste of CPU power.
diff -r 43f35b915dc7 -r 359eaf957bf1 DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Wed Jan 21 17:35:10 2004 +0000
+++ b/DOCS/xml/en/video.xml	Wed Jan 21 19:25:18 2004 +0000
@@ -1513,9 +1513,11 @@
 <listitem><para>
   Currently only codecs capable of UYVY colorspace output
   can work in conjunction with this driver. Unfortunately, this excludes
-  every single decoder from the libavcodec family. This leaves us with the
-  following usable popular codecs: <systemitem>cvid, divxds, xvid, divx4,
-  wmv7, wmv8</systemitem> and some others. Please note that this is only
+  every single decoder from the
+  <systemitem class="library">libavcodec</systemitem> family. This leaves
+  us with the following usable popular codecs:
+  <systemitem>cvid, divxds, xvid, divx4, wmv7, wmv8</systemitem> and some
+  others. Please note that this is only
   a temporal inconvenience. The usage syntax is as follows:
   <screen>
     mplayer -vf format=uyvy -vc divxds <replaceable>divx3file.avi</replaceable>
@@ -1944,7 +1946,9 @@
 <term><option>-vf lavc/fame</option></term>
 <listitem><para>
 To watch non-MPEG content on the em8300 (i.e. DivX or RealVideo) you have to
-specify an MPEG1 video filter such as libavcodec (lavc) or libfame (fame). At
+specify an MPEG1 video filter such as
+<systemitem class="library">libavcodec</systemitem> (lavc) or
+<systemitem class="library">libfame</systemitem> (fame). At
 the moment lavc is both faster and gives better image quality, it is suggested
 that you use that unless you have problems with it. See the man page for further
 info about <option>-vf lavc/fame</option>.
@@ -1993,7 +1997,8 @@
 This is a display-driver (<option>-vo zr</option>) for a number of MJPEG
 capture/playback cards (tested for DC10+ and Buz, and it should work for the
 LML33, the DC10). The driver works by encoding the frame to JPEG and then
-sending it to the card. For the JPEG encoding <systemitem>libavcodec</systemitem>
+sending it to the card. For the JPEG encoding
+<systemitem class="library">libavcodec</systemitem>
 is used, and required. With the special <emphasis>cinerama</emphasis> mode,
 you can watch movies in true wide screen provided that you have two beamers
 and two MJPEG cards. Depending on resolution and quality settings, this driver