CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/xml/en In directory mail:/var2/tmp/cvs-serv28168/en Modified Files: formats.xml Log Message: Remove empty sections, speak of container formats, not file formats. Index: formats.xml =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/xml/en/formats.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- formats.xml 5 Jan 2006 23:32:18 -0000 1.23 +++ formats.xml 7 Jan 2006 22:09:10 -0000 1.24 @@ -12,15 +12,15 @@ <para> You see, a <emphasis role="bold">codec</emphasis> is not the same as a -<emphasis role="bold">file format</emphasis>. +<emphasis role="bold">container format</emphasis>. Examples of video <emphasis role="bold">codecs</emphasis> are: MPEG-1, MPEG-2, MPEG-4 (DivX), Indeo5, 3ivx. -Examples of file <emphasis role="bold">formats</emphasis> are: MPG, AVI, ASF. +Examples of container <emphasis role="bold">formats</emphasis> are: MPG, AVI, ASF. </para> <para> In theory, you can put an OpenDivX video and MP3 audio -into an <emphasis role="bold">MPG format file</emphasis>. However, most +into an <emphasis role="bold">MPG container</emphasis>. However, most players will not play it, since they expect MPEG-1 video and MP2 audio (unlike <emphasis role="bold">AVI</emphasis>, <emphasis role="bold">MPG</emphasis> does not have the necessary fields to describe its video and audio streams). @@ -434,12 +434,6 @@ </para> </sect2> -<sect2 id="wav"> -<title>WAV files</title> -<para> -</para> -</sect2> - <sect2 id="ogg-vorbis"> <title>OGG/OGM files (Vorbis)</title> <para> @@ -449,17 +443,6 @@ </para> </sect2> -<sect2 id="wma-asf"> -<title>WMA/ASF files</title> -<para> -</para> -</sect2> - -<sect2 id="mp4"> -<title>MP4 files</title> -<para></para> -</sect2> - <sect2 id="cdda"> <title>CD audio</title> <para>