Mercurial > mplayer.hg

changeset 17338:217b6c98f815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove empty sections, speak of container formats, not file formats.
author diego
date Sat, 07 Jan 2006 22:09:10 +0000
parents 31d7b88c8c70
children ba7af0bb3e96
files DOCS/xml/en/formats.xml
diffstat 1 files changed, 3 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/en/formats.xml	Sat Jan 07 22:06:06 2006 +0000
+++ b/DOCS/xml/en/formats.xml	Sat Jan 07 22:09:10 2006 +0000
@@ -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>