CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/xml/en In directory mail:/var2/tmp/cvs-serv28213/en Modified Files: audio.xml codecs.xml documentation.xml formats.xml install.xml tvinput.xml video.xml Removed Files: features.xml Log Message: Improve overall structure by adding a few top-level chapters so that sections no longer nest as deeply. This has the added benefit of removing a few sections that only consisted of the section title. Index: audio.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/audio.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- audio.xml 24 Feb 2005 11:00:45 -0000 1.31 +++ audio.xml 5 Jan 2006 23:32:17 -0000 1.32 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect1 id="audio"> +<chapter id="audio"> <title>Audio output devices</title> -<sect2 id="sync"> +<sect1 id="sync"> <title>Audio/Video synchronization</title> <para> @@ -33,9 +33,9 @@ option, it should sort out your problems. See the man page for detailed information. </para> -</sect2> +</sect1> -<sect2 id="troubleshooting"> +<sect1 id="troubleshooting"> <title>Troubleshooting</title> <para>Some notes:</para> @@ -53,6 +53,6 @@ If the sound clicks when playing from CD-ROM, turn on IRQ unmasking as described in the <link linkend="drives">CD-ROM</link> section. </para> -</sect2> - </sect1> + +</chapter> Index: codecs.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/codecs.xml,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- codecs.xml 31 Dec 2005 00:41:35 -0000 1.73 +++ codecs.xml 5 Jan 2006 23:32:17 -0000 1.74 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect1 id="codecs"> -<title>Supported codecs</title> +<chapter id="codecs"> +<title>Codecs</title> -<sect2 id="video-codecs"> +<sect1 id="video-codecs"> <title>Video codecs</title> <para> @@ -76,7 +76,7 @@ </para> -<sect3 id="divx4-5"> +<sect2 id="divx4-5"> <title>DivX4/DivX5</title> <para> @@ -188,10 +188,10 @@ </note> </para> -</sect3> +</sect2> -<sect3 id="ffmpeg" xreflabel="FFmpeg/libavcodec"> +<sect2 id="ffmpeg" xreflabel="FFmpeg/libavcodec"> <title>FFmpeg/libavcodec</title> <para> @@ -276,10 +276,10 @@ With FFmpeg and my Matrox G400, I can view even the highest resolution DivX movies without dropped frames on my K6-2 500. </para> -</sect3> +</sect2> -<sect3 id="xanim"> +<sect2 id="xanim"> <title>XAnim codecs</title> <note> @@ -339,10 +339,10 @@ Tested codecs include: <emphasis role="bold">Indeo 3.2, 4.1, 5.0, CVID, 3ivX, H.263.</emphasis> </para> -</sect3> +</sect2> -<sect3 id="vivo-video"> +<sect2 id="vivo-video"> <title>VIVO video</title> <para> <application>MPlayer</application> can play Vivo (1.0 and 2.0) videos. The @@ -352,10 +352,10 @@ command line options <application>MPlayer</application> selects the best codec automatically. </para> -</sect3> +</sect2> -<sect3 id="mpeg12"> +<sect2 id="mpeg12"> <title>MPEG-1/2 video</title> <para> MPEG-1 and MPEG-2 are decoded by the multiplatform native <systemitem @@ -366,10 +366,10 @@ reinitializing the codec, continuing exactly from where the failure occurred. This recovery technique has no measurable speed penalty. </para> -</sect3> +</sect2> -<sect3 id="avicodecs"> +<sect2 id="avicodecs"> <title>MS Video1, Cinepak CVID, and other older codecs</title> <para> <application>MPlayer</application> is able to play most of the older codecs @@ -378,10 +378,10 @@ <emphasis role="bold">native codecs</emphasis> for most of them using <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>. </para> -</sect3> +</sect2> -<sect3 id="realvideo"> +<sect2 id="realvideo"> <title>RealVideo</title> <para> @@ -414,10 +414,10 @@ <emphasis role="bold">only work with Linux, FreeBSD, NetBSD and Cygwin on the x86, Alpha and PowerPC (Linux/Alpha and Linux/PowerPC have been tested) platforms and with Mac OS X</emphasis>. </para></note> -</sect3> +</sect2> -<sect3 id="xvid"> +<sect2 id="xvid"> <title>XviD</title> <para> @@ -478,10 +478,10 @@ <option>--with-xvidincdir=<replaceable>/path/to/</replaceable>xvid.h</option> </para></step> </procedure> -</sect3> +</sect2> -<sect3 id="sorenson"> +<sect2 id="sorenson"> <title>Sorenson</title> <para> @@ -517,12 +517,12 @@ <step><para>compile <application>MPlayer</application></para></step> </procedure> -</sect3> +</sect2> -<sect3 id="codec-x264"> +<sect2 id="codec-x264"> <title>x264</title> -<sect4 id="codec-x264-whatis"> +<sect3 id="codec-x264-whatis"> <title>What is x264?</title> <para> <systemitem class="library">x264</systemitem> is a library for @@ -557,9 +557,9 @@ <listitem><para>Parallel encoding of multiple slices</para></listitem> </itemizedlist> -</sect4> +</sect3> -<sect4 id="codec-h264-whatis"> +<sect3 id="codec-h264-whatis"> <title>What is H.264?</title> <para> H.264 is one name for a new digital video codec jointly developed @@ -597,9 +597,9 @@ but if you are interested in a brief overview, you may want to read <ulink url="http://www.cdt.luth.se/~peppar/kurs/smd151/spie04-h264OverviewPaper.pdf">The H.264/AVC Advanced Video Coding Standard: Overview and Introduction to the Fidelity Range Extensions</ulink>. </para> -</sect4> +</sect3> -<sect4 id="codec-x264-playback"> +<sect3 id="codec-x264-playback"> <title>How can I play H.264 videos with <application>MPlayer</application>?</title> <para> <application>MPlayer</application> uses @@ -619,9 +619,9 @@ H.264 decoding, you might keep an eye on <ulink url="http://mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/h264.c?cvsroot=FFMpeg">FFmpeg CVS repository's web interface</ulink>. </para> -</sect4> +</sect3> -<sect4 id="codec-x264-encode"> +<sect3 id="codec-x264-encode"> <title>How can I encode videos using <application>MEncoder</application> and <systemitem class="library">x264</systemitem>?</title> <para> If you have the subversion client installed, the latest x264 @@ -657,13 +657,13 @@ The configure script will autodetect that you have satisfied the requirements for <systemitem class="library">x264</systemitem>. </para> -</sect4> </sect3> </sect2> +</sect1> <!-- ********** --> -<sect2 id="audio-codecs"> +<sect1 id="audio-codecs"> <title>Audio codecs</title> <itemizedlist> @@ -711,7 +711,7 @@ </itemizedlist> -<sect3 id="swac3"> +<sect2 id="swac3"> <title>Software AC3 decoding</title> <para> @@ -747,10 +747,10 @@ (used by Soundblaster Live! cards) from August 2001 or newer (ALSA CVS is also supposed to work). </para> -</sect3> +</sect2> -<sect3 id="hwac3"> +<sect2 id="hwac3"> <title>Hardware AC3 decoding</title> <para> You need an AC3 capable sound card, with digital out (S/PDIF). The card's @@ -760,10 +760,10 @@ cards and Soundblaster Live! + ALSA (but not OSS) drivers and DXR3/Hollywood+ MPEG decoder cards. </para> -</sect3> +</sect2> -<sect3 id="libmad"> +<sect2 id="libmad"> <title>libmad support</title> <para> @@ -778,10 +778,10 @@ To enable support, compile with the <option>--enable-mad</option> configure option. </para> -</sect3> +</sect2> -<sect3 id="vivo-audio"> +<sect2 id="vivo-audio"> <title>VIVO audio</title> <para> The audio codec used in VIVO files depends on whether it is a VIVO/1.0 or @@ -789,10 +789,10 @@ and VIVO/2.0 files have <emphasis role="bold">Vivo Siren</emphasis> audio. Both are supported. </para> -</sect3> +</sect2> -<sect3 id="realaudio"> +<sect2 id="realaudio"> <title>RealAudio</title> <para> @@ -815,9 +815,9 @@ Instructions on how to install the RealPlayer libraries are in the <link linkend="realvideo">RealVideo</link> section. </para> -</sect3> +</sect2> -<sect3 id="qdesign"> +<sect2 id="qdesign"> <title>QDesign codecs</title> <para> QDesign audio streams (fourcc:<emphasis>QDMC, QDM2</emphasis>) are found @@ -825,9 +825,9 @@ libraries. For installation instructions please see the <link linkend="sorenson">Sorenson video codec</link> section. </para> -</sect3> +</sect2> -<sect3 id="qualcomm"> +<sect2 id="qualcomm"> <title>Qualcomm codecs</title> <para> Qualcomm audio streams (fourcc:<emphasis>Qclp</emphasis>) is found @@ -835,9 +835,9 @@ libraries. For installation instructions please see the <link linkend="sorenson">Sorenson video codec</link> section. </para> -</sect3> +</sect2> -<sect3 id="aac"> +<sect2 id="aac"> <title>AAC codec</title> <para> AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4 @@ -867,18 +867,18 @@ Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink> and RedHat RPMs from <ulink url="http://greysector.rangers.eu.org/">Grey Sector</ulink>. </para> -</sect3> - </sect2> +</sect1> + <!-- ********** --> -<sect2 id="codec-importing"> +<sect1 id="codec-importing"> <title>Win32 codecs importing HOWTO</title> <!-- TODO: a short paragraph of text would be nice here... --> -<sect3 id="vfw-codecs"> +<sect2 id="vfw-codecs"> <title>VFW codecs</title> <para> @@ -917,10 +917,10 @@ e.g. search for "VIDC.HFYU". To find out how to do this, look at the old DirectShow method below. </para></note> -</sect3> +</sect2> -<sect3 id="dshow-codecs"> +<sect2 id="dshow-codecs"> <title>DirectShow codecs</title> <para> @@ -1030,6 +1030,7 @@ <ulink url="http://www.mplayerhq.hu/MPlayer/DOCS/tech/codecs.conf.txt">DOCS/tech/codecs.conf.txt</ulink>. </para> -</sect3> </sect2> </sect1> + +</chapter> Index: documentation.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/documentation.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- documentation.xml 4 Jan 2006 15:28:01 -0000 1.27 +++ documentation.xml 5 Jan 2006 23:32:18 -0000 1.28 @@ -172,14 +172,20 @@ </para> &history.xml; -&install.xml; </chapter> +&install.xml; -&features.xml; &usage.xml; -&faq.xml; &cd-dvd.xml; +&faq.xml; + +&formats.xml; +&codecs.xml; +&video.xml; +&audio.xml; +&tvinput.xml; + &ports.xml; &mencoder.xml; &encoding-guide.xml; Index: formats.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/formats.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- formats.xml 28 Jul 2005 12:41:14 -0000 1.22 +++ formats.xml 5 Jan 2006 23:32:18 -0000 1.23 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect1 id="formats"> -<title>Supported formats</title> +<chapter id="containers"> +<title>Containers</title> <para> It is important to clarify a common mistake. When people see a file with a @@ -30,10 +30,10 @@ </para> -<sect2 id="video-formats"> +<sect1 id="video-formats"> <title>Video formats</title> -<sect3 id="mpg-vob-dat"> +<sect2 id="mpg-vob-dat"> <title>MPEG files</title> <para> @@ -85,10 +85,10 @@ rescaled during encoding or played with the <option>-aspect</option> option. </para> -</sect3> +</sect2> -<sect3 id="avi"> +<sect2 id="avi"> <title>AVI files</title> <para> @@ -167,10 +167,10 @@ There are only two known exceptions: <application>NanDub</application> and <link linkend="mencoder"><application>MEncoder</application></link>. </para> -</sect3> +</sect2> -<sect3 id="asf-wmv"> +<sect2 id="asf-wmv"> <title>ASF/WMV files</title> <para> ASF (Active Streaming Format) comes from Microsoft. They developed two @@ -182,10 +182,10 @@ v2.0 files :). Note that ASF files nowadays come with the extension <filename>.WMA</filename> or <filename>.WMV</filename>. </para> -</sect3> +</sect2> -<sect3 id="mov"> +<sect2 id="mov"> <title>QuickTime/MOV files</title> <para> @@ -204,10 +204,10 @@ QDesign Music audio. See our <link linkend="sorenson">Sorenson</link> codec section. </para> </note> -</sect3> +</sect2> -<sect3 id="vivo"> +<sect2 id="vivo"> <title>VIVO files</title> <para> @@ -231,10 +231,10 @@ <link linkend="vivo-audio">VIVO audio codec</link> sections for installation instructions. </para> -</sect3> +</sect2> -<sect3 id="fli"> +<sect2 id="fli"> <title>FLI files</title> <para> <emphasis role="bold">FLI</emphasis> is a very old file format used by @@ -244,10 +244,10 @@ <option>-loop</option> option). FLI files do not have keyframes, so the picture will be messy for a short time after seeking. </para> -</sect3> +</sect2> -<sect3 id="realmedia"> +<sect2 id="realmedia"> <title>RealMedia (RM) files</title> <para> @@ -257,10 +257,10 @@ linkend="realvideo">RealVideo</link> and <link linkend="realaudio">RealAudio</link> codecs. </para> -</sect3> +</sect2> -<sect3 id="nuppelvideo"> +<sect2 id="nuppelvideo"> <title>NuppelVideo files</title> <para> <ulink url="http://frost.htu.tuwien.ac.at/~roman/nuppelvideo/">NuppelVideo</ulink> @@ -272,10 +272,10 @@ them with <application>MEncoder</application> to MPEG-4 (DivX)/etc!) them all. Seeking works. </para> -</sect3> +</sect2> -<sect3 id="yuv4mpeg"> +<sect2 id="yuv4mpeg"> <title>yuv4mpeg files</title> <para> <ulink url="http://mjpeg.sf.net">yuv4mpeg / yuv4mpeg2</ulink> @@ -284,27 +284,27 @@ You can grab, produce, filter or encode video in this format using these tools. The file format is really a sequence of uncompressed YUV 4:2:0 images. </para> -</sect3> +</sect2> -<sect3 id="film"> +<sect2 id="film"> <title>FILM files</title> <para> This format is used on old Sega Saturn CD-ROM games. </para> -</sect3> +</sect2> -<sect3 id="roq"> +<sect2 id="roq"> <title>RoQ files</title> <para> RoQ files are multimedia files used in some ID games such as Quake III and Return to Castle Wolfenstein. </para> -</sect3> +</sect2> -<sect3 id="ogg"> +<sect2 id="ogg"> <title>OGG/OGM files</title> <para> This is a new fileformat from <ulink url="http://www.xiph.org">Xiphophorus</ulink>. @@ -313,10 +313,10 @@ <systemitem class="library">libvorbis</systemitem> installed before compiling <application>MPlayer</application> to be able to play it. </para> -</sect3> +</sect2> -<sect3 id="sdp"> +<sect2 id="sdp"> <title>SDP files</title> <para> <ulink url="ftp://ftp.rfc-editor.org/in-notes/rfc2327.txt">SDP</ulink> is an @@ -324,19 +324,19 @@ (The "<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>" are required.) </para> -</sect3> +</sect2> -<sect3 id="pva"> +<sect2 id="pva"> <title>PVA files</title> <para> PVA is an MPEG-like format used by DVB TV boards' software (e.g.: <application>MultiDec</application>, <application>WinTV</application> under Windows). </para> -</sect3> +</sect2> -<sect3 id="nsv"> +<sect2 id="nsv"> <title>NSV files</title> <para> NSV (NullSoft Video) is the file format used by the @@ -350,29 +350,29 @@ depacketization layer that still has to be implemented (those files are unplayable anyway because they use VLB audio). </para> -</sect3> +</sect2> -<sect3 id="matroska"> +<sect2 id="matroska"> <title>Matroska files</title> <para> Matroska is an open container format. Read more on the <ulink url="http://www.matroska.org/">official site</ulink>. </para> -</sect3> +</sect2> -<sect3 id="nut"> +<sect2 id="nut"> <title>NUT files</title> <para> NUT is the container format developed by <application>MPlayer</application> and <application>FFmpeg</application> folks. Both projects support it. Read more on the <ulink url="http://www.nut.hu/">official site</ulink>. </para> -</sect3> +</sect2> -<sect3 id="gif"> +<sect2 id="gif"> <title>GIF files</title> <para> The <emphasis role="bold">GIF</emphasis> format is a common format for web @@ -406,12 +406,12 @@ homepage</ulink>. For detailed technical information, have a look at the <ulink url="http://www.w3.org/Graphics/GIF/spec-gif89a.txt">GIF89a specification</ulink>. </para> -</sect3> </sect2> +</sect1> <!-- ********** --> -<sect2 id="audio-formats"> +<sect1 id="audio-formats"> <title>Audio formats</title> <para> @@ -422,7 +422,7 @@ url="http://www.xmms.org">XMMS</ulink>. </para> -<sect3 id="mp3"> +<sect2 id="mp3"> <title>MP3 files</title> <para> You may have problems playing certain MP3 files that @@ -432,35 +432,35 @@ foreseeable future. The <option>-demuxer</option> flag described in the man page may help you in these cases. </para> -</sect3> +</sect2> -<sect3 id="wav"> +<sect2 id="wav"> <title>WAV files</title> <para> </para> -</sect3> +</sect2> -<sect3 id="ogg-vorbis"> +<sect2 id="ogg-vorbis"> <title>OGG/OGM files (Vorbis)</title> <para> Requires properly installed <systemitem class="library">libogg</systemitem> and <systemitem class="library">libvorbis</systemitem>. </para> -</sect3> +</sect2> -<sect3 id="wma-asf"> +<sect2 id="wma-asf"> <title>WMA/ASF files</title> <para> </para> -</sect3> +</sect2> -<sect3 id="mp4"> +<sect2 id="mp4"> <title>MP4 files</title> <para></para> -</sect3> +</sect2> -<sect3 id="cdda"> +<sect2 id="cdda"> <title>CD audio</title> <para> <application>MPlayer</application> can use <application>cdparanoia</application> @@ -472,9 +472,9 @@ See the man page's <option>-cdda</option> option which can be used to pass options to <application>cdparanoia</application>. </para> -</sect3> +</sect2> -<sect3 id="xmms"> +<sect2 id="xmms"> <title>XMMS</title> <para> <application>MPlayer</application> can use <application>XMMS</application> input @@ -491,6 +491,7 @@ plugin and library path explicitly by way of the <option>--with-xmmsplugindir</option> and <option>--with-xmmslibdir</option> options. </para> -</sect3> </sect2> </sect1> + +</chapter> Index: install.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/install.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- install.xml 4 Oct 2005 21:43:29 -0000 1.59 +++ install.xml 5 Jan 2006 23:32:18 -0000 1.60 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect1 id="install"> +<chapter id="install"> <title>Installation</title> <para> @@ -22,8 +22,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended. </para> - -<sect2 id="softreq"> +<sect1 id="softreq"> <title>Software requirements</title> <itemizedlist> @@ -132,10 +131,10 @@ <filename>./configure</filename> where that file is. </para></listitem> </itemizedlist> -</sect2> +</sect1> -<sect2> +<sect1 id="installation_codecs"> <title>Codecs</title> <itemizedlist> @@ -258,10 +257,10 @@ section for installation instructions and more information. </para></listitem> </itemizedlist> -</sect2> +</sect1> -<sect2 id="video-cards"> +<sect1 id="video-cards"> <title>Video cards</title> <para> @@ -271,7 +270,7 @@ </para> -<sect3 id="yuv-cards"> +<sect2 id="yuv-cards"> <title>YUV cards</title> <para> @@ -348,10 +347,10 @@ </para></listitem> </itemizedlist> </para> -</sect3> +</sect2> -<sect3 id="non-yuv-cards" xreflabel="Non-YUV cards"> +<sect2 id="non-yuv-cards" xreflabel="Non-YUV cards"> <title>Non-YUV cards</title> <para> @@ -377,10 +376,10 @@ </simpara></listitem> </itemizedlist> </para> -</sect3> +</sect2> <!-- FIXME: find a more logical organization for this section --> -<sect3 id="cirrus-logic-cards" xreflabel="Cirrus-Logic cards"> +<sect2 id="cirrus-logic-cards" xreflabel="Cirrus-Logic cards"> <title>Cirrus-Logic cards</title> <itemizedlist> <listitem><para> @@ -410,11 +409,11 @@ </itemizedlist> </para></listitem> </itemizedlist> -</sect3> </sect2> +</sect1> -<sect2 id="sound-cards"> +<sect1 id="sound-cards"> <title>Sound cards</title> <itemizedlist> @@ -435,10 +434,10 @@ to read the <link linkend="audio">sound card</link> section!</emphasis> </simpara></listitem> </itemizedlist> -</sect2> +</sect1> -<sect2> +<sect1 id="features"> <title>Features</title> <itemizedlist> @@ -521,7 +520,6 @@ See the <link linkend="subosd">Subtitles and OSD</link> section for details. </para> -</sect2> </sect1> <!-- ********** --> @@ -957,3 +955,5 @@ </para></note> </para> </sect1> + +</chapter> Index: tvinput.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/tvinput.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tvinput.xml 31 Dec 2005 19:16:14 -0000 1.15 +++ tvinput.xml 5 Jan 2006 23:32:18 -0000 1.16 @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> +<chapter id="tv"> +<title>TV</title> + <sect1 id="tv-input" xreflabel="TV input"> <title>TV input</title> @@ -211,3 +214,5 @@ </informalexample> </sect2> </sect1> + +</chapter> Index: video.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/video.xml,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- video.xml 2 Jul 2005 23:33:40 -0000 1.81 +++ video.xml 5 Jan 2006 23:32:18 -0000 1.82 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- $Revision$ --> -<sect1 id="video"> +<chapter id="video"> <title>Video output devices</title> -<sect2 id="mtrr"> +<sect1 id="mtrr"> <title>Setting up MTRR</title> <para> @@ -83,11 +83,11 @@ stepping 0) CPUs don't have MTRRs, but stepping 12 does (execute <command>cat /proc/cpuinfo</command> to check it). </para> -</sect2> +</sect1> -<sect2 id="output-trad"> +<sect1 id="output-trad"> <title>Video outputs for traditional video cards</title> -<sect3 id="xv"> +<sect2 id="xv"> <title>Xv</title> <para> @@ -161,7 +161,7 @@ </orderedlist> </para> -<sect4 id="tdfx"> +<sect3 id="tdfx"> <title>3dfx cards</title> <para> @@ -179,10 +179,10 @@ <option>-vo tdfxfb</option> driver! See the <link linkend="tdfxfb">tdfxfb</link> section. </para> -</sect4> +</sect3> -<sect4 id="s3"> +<sect3 id="s3"> <title>S3 cards</title> <para> @@ -198,10 +198,10 @@ on the MPlayer-users mailing list for an MMX/3DNow! enabled driver. </para> </note> -</sect4> +</sect3> -<sect4 id="nvidia"> +<sect3 id="nvidia"> <title>nVidia cards</title> <para> @@ -224,10 +224,10 @@ is in beta stage, and has some drawbacks. For more information, see <link linkend="vidix-nvidia">nVidia VIDIX</link> section. </para> -</sect4> +</sect3> -<sect4 id="ati"> +<sect3 id="ati"> <title>ATI cards</title> <para> @@ -245,10 +245,10 @@ <emphasis role="bold">TV output</emphasis>, and no libraries or X are needed. Read the <link linkend="vidix">VIDIX</link> section. </para> -</sect4> +</sect3> -<sect4 id="neomagic"> +<sect3 id="neomagic"> <title>NeoMagic cards</title> <para> @@ -277,10 +277,10 @@ EndSection<!-- --></programlisting> </para> -</sect4> +</sect3> -<sect4 id="trident"> +<sect3 id="trident"> <title>Trident cards</title> <para> If you want to use Xv with a Trident card, provided that it doesn't work @@ -293,22 +293,22 @@ <link linkend="vidix">VIDIX</link> driver for the Cyberblade/i1 card. </para> -</sect4> +</sect3> -<sect4 id="kyro"> +<sect3 id="kyro"> <title>Kyro/PowerVR cards</title> <para> If you want to use Xv with a Kyro based card (for example Hercules Prophet 4000XT), you should download the drivers from the <ulink url="http://www.powervr.com/">PowerVR site</ulink> </para> -</sect4> </sect3> +</sect2> <!-- ********** --> -<sect3 id="dga"> +<sect2 id="dga"> <title>DGA</title> <formalpara> @@ -591,12 +591,12 @@ </simpara></listitem> </itemizedlist> -</sect3> -<!--</sect2>--> +</sect2> +<!--</sect1>--> <!-- ********** --> -<sect3 id="sdl"> +<sect2 id="sdl"> <title>SDL</title> <para> @@ -684,10 +684,10 @@ DO NOT USE SDL with GUI! It won't work as it should. </simpara></listitem> </itemizedlist> -</sect3> +</sect2> -<sect3 id="svgalib"> +<sect2 id="svgalib"> <title>SVGAlib</title> <formalpara> @@ -760,10 +760,10 @@ You can turn on OSD and subtitles only with the <option>expand</option> filter, see the man page for exact parameters. </para> -</sect3> +</sect2> -<sect3 id="fbdev"> +<sect2 id="fbdev"> <title>Framebuffer output (FBdev)</title> <para> @@ -857,10 +857,10 @@ <application>MPlayer</application> limitation. </para> </note> -</sect3> +</sect2> -<sect3 id="mga_vid"> +<sect2 id="mga_vid"> <title>Matrox framebuffer (mga_vid)</title> <para> @@ -934,10 +934,10 @@ and can be written for brightness change: <screen>echo "brightness=120" > /dev/mga_vid</screen> </para> -</sect3> +</sect2> -<sect3 id="tdfxfb" xreflabel="3Dfx YUV support (tdfxfb)"> +<sect2 id="tdfxfb" xreflabel="3Dfx YUV support (tdfxfb)"> <title>3Dfx YUV support</title> <para> This driver uses the kernel's tdfx framebuffer driver to play movies with @@ -945,10 +945,10 @@ with <screen>./configure --enable-tdfxfb</screen> </para> -</sect3> +</sect2> -<sect3 id="opengl"> +<sect2 id="opengl"> <title>OpenGL output</title> <para> @@ -983,10 +983,10 @@ <command>export $__GL_SYNC_TO_VBLANK=1</command> </para> -</sect3> +</sect2> -<sect3 id="aalib"> +<sect2 id="aalib"> <title>AAlib - text mode displaying</title> <para> @@ -1112,10 +1112,10 @@ See <ulink url="http://aa-project.sf.net/tune"/> for further tuning issues. </para> -</sect3> +</sect2> -<sect3 id="caca"> +<sect2 id="caca"> <title><systemitem class="library">libcaca</systemitem> - Color ASCII Art library</title> <para> @@ -1205,10 +1205,10 @@ enough to render all frames. </para> -</sect3> +</sect2> -<sect3 id="vesa"> +<sect2 id="vesa"> <title>VESA - output to VESA BIOS</title> <para> @@ -1344,10 +1344,10 @@ itself only once during POST procedure. </simpara></listitem> </itemizedlist> -</sect3> +</sect2> -<sect3 id="x11"> +<sect2 id="x11"> <title>X11</title> <para> @@ -1392,10 +1392,10 @@ drivers can't use low pixelclocks that are needed for low resolution video modes. </para> -</sect3> +</sect2> -<sect3 id="vidix"> +<sect2 id="vidix"> <title>VIDIX</title> <formalpara> @@ -1541,7 +1541,7 @@ </para></step> </procedure> -<sect4 id="vidix-ati"> +<sect3 id="vidix-ati"> <title>ATI cards</title> <para> Currently most ATI cards are supported natively, from Mach64 to the @@ -1553,9 +1553,9 @@ <filename>rage128_vid</filename> for Rage 128 cards. You may force one or let the VIDIX system autoprobe all available drivers. </para> -</sect4> +</sect3> -<sect4 id="vidix-mga"> +<sect3 id="vidix-mga"> <title>Matrox cards</title> <para> Matrox G200, G400, G450 and G550 have been reported to work. @@ -1565,9 +1565,9 @@ The driver supports video equalizers and should be nearly as fast as the <link linkend="mga_vid">Matrox framebuffer</link> </para> -</sect4> +</sect3> -<sect4 id="vidix-trident"> +<sect3 id="vidix-trident"> <title>Trident cards</title> <para> There is a driver available for the Trident Cyberblade/i1 chipset, which @@ -1578,17 +1578,17 @@ The driver was written and is maintained by <ulink url="http://www.blackfiveservices.co.uk/EPIAVidix.shtml">Alastair M. Robinson</ulink> </para> -</sect4> +</sect3> -<sect4 id="vidix-3dlabs"> +<sect3 id="vidix-3dlabs"> <title>3DLabs cards</title> <para> Although there is a driver for the 3DLabs GLINT R3 and Permedia3 chips, no one has tested it, so reports are welcome. </para> -</sect4> +</sect3> -<sect4 id="vidix-nvidia"> +<sect3 id="vidix-nvidia"> <title>nVidia cards</title> <para> There's a relatively new nVidia driver out there, it's known to work on Riva @@ -1631,9 +1631,9 @@ <para> Reports awaited! </para> -</sect4> +</sect3> -<sect4 id="vidix-sis"> +<sect3 id="vidix-sis"> <title>SiS cards</title> <para> This is very experimental code, just like nvidia_vid. @@ -1647,10 +1647,10 @@ <para> Reports awaited! </para> -</sect4> </sect3> +</sect2> -<sect3 id="directfb"> +<sect2 id="directfb"> <title>DirectFB</title> <blockquote><para> "DirectFB is a graphics library which was designed with embedded systems @@ -1673,9 +1673,9 @@ be done by the subdevice method, e.g.: <option>-vo directfb:2</option> (layer -1 is default: autodetect) </para> -</sect3> +</sect2> -<sect3 id="dfbmga"> +<sect2 id="dfbmga"> <title>DirectFB/Matrox (dfbmga)</title> <para> Please read the <link linkend="directfb">main DirectFB</link> section for general @@ -1703,13 +1703,13 @@ <link linkend="mga_vid">mga_vid</link> has been planned for years, <ulink url="../../tech/patches.txt">patches</ulink> are welcome. </para></note> -</sect3> </sect2> +</sect1> -<sect2 id="mpeg_decoders"> +<sect1 id="mpeg_decoders"> <title>MPEG decoders</title> -<sect3 id="dvb"> +<sect2 id="dvb"> <title>DVB output and input</title> <para> <application>MPlayer</application> supports cards with the Siemens DVB chipset @@ -1948,9 +1948,9 @@ non-25fps movies and realtime transcoding between MPEG-2 and MPEG-4 (partial decompression). </para> -</sect3> +</sect2> -<sect3 id="dxr2"> +<sect2 id="dxr2"> <title>DXR2</title> <para><application>MPlayer</application> supports hardware accelerated playback with the Creative DXR2 card.</para> @@ -1988,9 +1988,9 @@ </para> <para>Please see the man page for available options.</para> -</sect3> +</sect2> -<sect3 id="dxr3"> +<sect2 id="dxr3"> <title>DXR3/Hollywood+</title> <para> <application>MPlayer</application> supports hardware accelerated playback @@ -2112,14 +2112,14 @@ </para></listitem> </varlistentry> </variablelist> -</sect3> - </sect2> -<sect2 id="other"> +</sect1> + +<sect1 id="other"> <title>Other visualization hardware</title> -<sect3 id="zr"> +<sect2 id="zr"> <title>Zr</title> <para> @@ -2212,9 +2212,9 @@ start <application>MPlayer</application>, wait for <application>MPlayer</application> to finish and <emphasis role="bold">THEN</emphasis> stop XawTV. </para> -</sect3> +</sect2> -<sect3 id="blinkenlights"> +<sect2 id="blinkenlights"> <title>Blinkenlights</title> <para> This driver is capable of playback using the Blinkenlights UDP protocol. If you @@ -2228,13 +2228,13 @@ On the Arcade video you can see the Blinkenlights output driver in action at 00:07:50. </para> -</sect3> </sect2> +</sect1> -<sect2 id="tvout"> +<sect1 id="tvout"> <title>TV-out support</title> -<sect3 id="tvout-mga-g400"> +<sect2 id="tvout-mga-g400"> <title>Matrox G400 cards</title> <para> @@ -2374,9 +2374,9 @@ pins. (info contributed from Balázs Kerekes) </para> </formalpara> -</sect3> +</sect2> -<sect3 id="tv-out_matrox_g450"> +<sect2 id="tv-out_matrox_g450"> <title>Matrox G450/G550 cards</title> <para> TV output support for these cards has only been recently introduced, and is @@ -2400,10 +2400,10 @@ The necessary kernel patch and the detailed HOWTO is downloadable from <ulink url="http://www.bglug.ca/matrox_tvout/"/> </para> -</sect3> +</sect2> -<sect3 id="tvout-ati"> +<sect2 id="tvout-ati"> <title>ATI cards</title> <formalpara> @@ -2446,17 +2446,17 @@ plugged in before booting your PC</emphasis> since video BIOS initializes itself only once during POST procedure. </para> -</sect3> +</sect2> -<sect3 id="tvout-voodoo"> +<sect2 id="tvout-voodoo"> <title>Voodoo 3</title> <para> Check <ulink url="http://www.iki.fi/too/tvout-voodoo3-3000-xfree">this URL</ulink>. </para> -</sect3> +</sect2> -<sect3 id="tvout-nvidia"> +<sect2 id="tvout-nvidia"> <title>nVidia</title> <para> First, you MUST download the closed-source drivers from <ulink url="http://nvidia.com"/>. @@ -2493,9 +2493,9 @@ <para> Of course the important thing is the TwinView part. </para> -</sect3> +</sect2> -<sect3 id="tvout-neomagic"> +<sect2 id="tvout-neomagic"> <title>NeoMagic</title> <para> The NeoMagic chip is found in a variety of laptops, some of them are equipped @@ -2542,6 +2542,7 @@ </listitem> </itemizedlist> </para> -</sect3> </sect2> </sect1> + +</chapter> --- features.xml DELETED ---