Commit d782d24b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* CVS -> SVN

* update of some features.
* update VLS vs. VLC situation concerning streaming.
parent acbeeb72
......@@ -17,8 +17,10 @@ subscribe to the <a href="/support/lists.html">mailing-lists</a>, have
a look at the <a href="http://bugzilla.videolan.org/">bug-tracking
system</a>, join the <a href="/support/">IRC channel</a> and start to
code! Send your code to the developer mailing-lists under the form of
patches for the current CVS. If you often make good contributions, the
VideoLAN team will give you a CVS write account. </p>
patches for the current <a href="http://developers.videolan.org/svn.html">
Version Controlled Sources</a>. If you often make good contributions, the
VideoLAN team will give you a <a href="http://developers.videolan.org/svn.html">
Subversion</a> write account. </p>
<p> If you have time but no programming skills, you can help with the
documentation, the translation of the VLC interface and the VideoLAN
......
......@@ -319,7 +319,7 @@ Downloadseite</ulink>. Dekomprimieren Sie sie:
<!-- bootstrap is already done is the tarballs -->
<para>
Wenn Sie Quellen aus dem CVS benutzen, mssen Sie
Wenn Sie Quellen aus dem SVN benutzen, mssen Sie
folgendes laufen lassen:
</para>
......
......@@ -314,7 +314,7 @@ download page</ulink>. Uncompress-it :
<!-- bootstrap is already done is the tarballs -->
<para>
If you use sources from CVS, you need to run :
If you use sources from SVN, you need to run :
</para>
<screen>
......
......@@ -313,7 +313,7 @@ url="http://www.videolan.org/vlc/download-sources.html">p
<!-- bootstrap is already done is the tarballs -->
<para>
Si está utilizando las fuentes de CVS, necesita ejecutar :
Si está utilizando las fuentes de SVN, necesita ejecutar :
</para>
<screen>
......
......@@ -320,7 +320,7 @@ t
<!-- bootstrap is already done is the tarballs -->
<para>
Si vous utilisez des sources venant de CVS et non d'un tarball, vous devez d'abord executer :
Si vous utilisez des sources venant de SVN et non d'un tarball, vous devez d'abord executer :
</para>
<screen>
......
......@@ -621,10 +621,10 @@ Downloadseite</ulink>. Dekomprimieren Sie sie:</span>
<!-- bootstrap is already done is the tarballs -->
<para>
<span xml:lang="en">If you use sources from CVS, you need to run :</span>
<span xml:lang="fr">Si vous utilisez des sources venant de CVS et non d'un tarball, vous devez d'abord executer :</span>
<span xml:lang="es">Si est utilizando las fuentes de CVS, necesita ejecutar :</span>
<span xml:lang="de">Wenn Sie Quellen aus dem CVS benutzen, mssen Sie
<span xml:lang="en">If you use sources from SVN, you need to run :</span>
<span xml:lang="fr">Si vous utilisez des sources venant de SVN et non d'un tarball, vous devez d'abord executer :</span>
<span xml:lang="es">Si est utilizando las fuentes de SVN, necesita ejecutar :</span>
<span xml:lang="de">Wenn Sie Quellen aus dem SVN benutzen, mssen Sie
folgendes laufen lassen:</span>
</para>
......
......@@ -234,13 +234,13 @@ bedeutet, dass der Stream in der Lage sein wird, 11 Router zu
</title>
<note><para>
<span xml:lang="en">For this, you must use the CVS version of VLC and compile
<span xml:lang="en">For this, you must use the SVN version of VLC and compile
it with <command>./configure --enable-dvb</command> This feature should
still be considered as experimental.</span>
<span xml:lang="es">Para esto, se debera utilizar la versin CVS de VLC y compilarla
<span xml:lang="es">Para esto, se debera utilizar la versin SVN de VLC y compilarla
con <command>./configure --enable-dvb</command> Esta caracterstica debera
ser considerada todava como experimental.</span>
<span xml:lang="de">Dazu bentigen Sie die CVS-Version von VLC und sie mit
<span xml:lang="de">Dazu bentigen Sie die SVN-Version von VLC und sie mit
<command>./configure --enable-dvb</command> kompilieren. Dieses Feature
sollte noch als experimentell angesehen werden.</span>
</para></note>
......
......@@ -81,24 +81,24 @@ v4l2 API (Video 4 Linux version 2) unterst
.</para>
<para>
<span xml:lang="en">Once your kernel is ready, install the CVS version
<span xml:lang="en">Once your kernel is ready, install the SVN version
of the Linux drivers for the Hauppauge WinTV-PVR-250/350. They are hosted on
<ulink url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Then, you will have to create the device and load the modules; for this,
please refer to the documentation shipped with the drivers</span>
<span xml:lang="fr">Quand votre noyau est prt,
installez la version CVS des drivers Linux pour la
installez la version SVN des drivers Linux pour la
Hauppauge WinTV-PVR-250/350. Vous les trouverez sur <ulink
url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Ensuite, vous devrez crer les priphriques et charger les modules;
pour cel, rfrez vous la documentation des drivers</span>
<span xml:lang="es">Una vez que el kernel est listo, instale la versin
CVS de los drivers Linux para la Hauppauge WinTV-PVR-250/350. Estn
SVN de los drivers Linux para la Hauppauge WinTV-PVR-250/350. Estn
disponibles en <ulink url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Despus tendr que crear el dispositivo y cargar los mdulos; para esto
por favor consulte la documentacin de los drivers</span>
<span xml:lang="de">Wenn Ihr Kernel fertig ist, installieren Sie die
CVS-Version der Linux-Treiber fr die Hauppauge WinTV-PVR-250/350. Sie sind verfgbar
SVN-Version der Linux-Treiber fr die Hauppauge WinTV-PVR-250/350. Sie sind verfgbar
auf <ulink url="http://ivtv.sourceforge.net">ivtv.sourceforge.net</ulink>. Danach
mssen Sie das Device erzeugen und die Module laden. Beachten Sie dafr bitte
die den Treibern beiliegende Dokumentation
......@@ -264,10 +264,10 @@ Ihrer IP-Pakete (was hei
</title>
<para>
<span xml:lang="en">You must use the CVS version of VLS</span>
<span xml:lang="fr">Vous devez utiliser la version CVS de VLS</span>
<span xml:lang="es">Debe usar la versin CVS de VLS</span>
<span xml:lang="de">Sie mssen die CVS-Version von VLS benutzen</span>
<span xml:lang="en">You must use the SVN version of VLS</span>
<span xml:lang="fr">Vous devez utiliser la version SVN de VLS</span>
<span xml:lang="es">Debe usar la versin SVN de VLS</span>
<span xml:lang="de">Sie mssen die SVN-Version von VLS benutzen</span>
.</para>
<para>
......
......@@ -357,22 +357,22 @@ bedeutet, dass der Stream in derLage sein wird, 11 Router zu
</title>
<note><para>
<span xml:lang="en">You need the CVS version of VLS. When you
<span xml:lang="en">You need the SVN version of VLS. When you
compile it, you must do a <command>./bootstrap</command> and
<command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (where <emphasis>PATH</emphasis> is the
absolute path to the directory where you compiled ffmpeg, and not the
relative path !)</span>
<span xml:lang="fr">Vous devez avoir la version CVS de VLS. Quand vous
<span xml:lang="fr">Vous devez avoir la version SVN de VLS. Quand vous
la compilez, vous devez utiliser <command>./bootstrap</command> puis
<command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (avec <emphasis>PATH</emphasis> le chemin
absolu vers le rpertoire o vous avez compil ffmpeg, et non pas le
chemin relatif !)</span>
<span xml:lang="es">Se necesita la versin CVS de VLS. Cuando se compila,
<span xml:lang="es">Se necesita la versin SVN de VLS. Cuando se compila,
se debe hacer un <command>./bootstrap</command> y un <command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (donde <emphasis>PATH</emphasis> es la ruta absoluta al directorio donde se compile ffmpeg, y no la ruta relativa !)</span>
<span xml:lang="de">Sie bentigen die CVS-Version von VLS. Wenn Sie sie
<span xml:lang="de">Sie bentigen die SVN-Version von VLS. Wenn Sie sie
kompilieren, mssen Sie <command>./bootstrap</command> und <command>
./configure --enable-v4l --with-ffmpeg=PATH</command> ausfhren, wobei
<emphasis>PATH</emphasis> der absolute Pfad zu dem Verzeichnis ist, in dem Sie
......
......@@ -114,7 +114,7 @@ bedeutet, dass der Stream in der Lage sein wird, 11 Router zu
Streaming mit VLC
</title>
<note><para>Dazu benötigen Sie die CVS-Version von VLC und sie mit
<note><para>Dazu benötigen Sie die SVN-Version von VLC und sie mit
<command>./configure --enable-dvb</command> kompilieren. Dieses Feature
sollte noch als experimentell angesehen werden.
</para></note>
......
......@@ -72,7 +72,7 @@ v4l2 API (Video 4 Linux version 2) unterst
Wenn Ihr Kernel fertig ist, installieren Sie die
CVS-Version der Linux-Treiber fr die Hauppauge WinTV-PVR-250/350. Sie sind verfgbar
SVN-Version der Linux-Treiber fr die Hauppauge WinTV-PVR-250/350. Sie sind verfgbar
auf <ulink url="http://ivtv.sourceforge.net">ivtv.sourceforge.net</ulink>. Danach
mssen Sie das Device erzeugen und die Module laden. Beachten Sie dafr bitte
die den Treibern beiliegende Dokumentation.
......@@ -223,7 +223,7 @@ Streaming mit VLS
Sie mssen die CVS-Version von VLS benutzen.
Sie mssen die SVN-Version von VLS benutzen.
</para>
......
......@@ -284,7 +284,7 @@ Streaming mit VLS
Sie bentigen die CVS-Version von VLS. Wenn Sie sie
Sie bentigen die SVN-Version von VLS. Wenn Sie sie
kompilieren, mssen Sie <command>./bootstrap</command> und <command>.
/configure --enable-v4l --with-ffmpeg=PATH</command> ausfhren, wobei
......
......@@ -113,7 +113,7 @@ Stream with VLC
</title>
<note><para>
For this, you must use the CVS version of VLC and compile
For this, you must use the SVN version of VLC and compile
it with <command>./configure --enable-dvb</command> This feature should
still be considered as experimental.</para></note>
......
......@@ -40,7 +40,7 @@ the v4l2 API (Video 4 Linux version 2). The patch is available on the
</para>
<para>
Once your kernel is ready, install the CVS version
Once your kernel is ready, install the SVN version
of the Linux drivers for the Hauppauge WinTV-PVR-250/350. They are hosted on
<ulink url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Then, you will have to create the device and load the modules; for this,
......@@ -139,7 +139,7 @@ Stream with VLS
</title>
<para>
You must use the CVS version of VLS.
You must use the SVN version of VLS.
</para>
<para>
......
......@@ -169,7 +169,7 @@ Stream with VLS
</title>
<note><para>
You need the CVS version of VLS. When you
You need the SVN version of VLS. When you
compile it, you must do a <command>./bootstrap</command> and
<command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (where <emphasis>PATH</emphasis> is the
......
......@@ -180,7 +180,7 @@ Transmisi
<note><para>
Para esto, se debería utilizar la versión CVS de VLC y compilarla
Para esto, se debería utilizar la versión SVN de VLC y compilarla
con <command>./configure --enable-dvb</command> Esta característica debería
ser considerada todavía como experimental.
......
......@@ -69,7 +69,7 @@ al API v412 (Video 4 Linux version 2). El patch est
Una vez que el kernel está listo, instale la versión
CVS de los drivers Linux para la Hauppauge WinTV-PVR-250/350. Están
SVN de los drivers Linux para la Hauppauge WinTV-PVR-250/350. Están
disponibles en <ulink url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Después tendrá que crear el dispositivo y cargar los módulos; para esto
por favor consulte la documentación de los drivers
......@@ -217,7 +217,7 @@ Transmisi
<para>
Debe usar la versión CVS de VLS
Debe usar la versión SVN de VLS
.</para>
......
......@@ -266,7 +266,7 @@ Transmisi
<note><para>
Se necesita la versión CVS de VLS. Cuando se compila,
Se necesita la versión SVN de VLS. Cuando se compila,
se debe hacer un <command>./bootstrap</command> y un <command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (donde <emphasis>PATH</emphasis> es la ruta absoluta al directorio donde se compile ffmpeg, y no la ruta relativa !)
......
......@@ -64,7 +64,7 @@ sur <ulink url="http://bytesex.org/v4l/">Video4Linux HQ</ulink>
<para>
Quand votre noyau est prt,
installez la version CVS des drivers Linux pour la
installez la version SVN des drivers Linux pour la
Hauppauge WinTV-PVR-250/350. Vous les trouverez sur <ulink url="http://ivtv.sourceforge.net/">ivtv.sourceforge.net</ulink>.
Ensuite, vous devrez crer les priphriques et charger les modules;
pour cel, rfrez vous la documentation des drivers
......@@ -211,7 +211,7 @@ Diffusez avec VLS
<para>
Vous devez utiliser la version CVS de VLS
Vous devez utiliser la version SVN de VLS
.</para>
......
......@@ -254,7 +254,7 @@ Diffusez avec VLS
<note><para>
Vous devez avoir la version CVS de VLS. Quand vous
Vous devez avoir la version SVN de VLS. Quand vous
la compilez, vous devez utiliser <command>./bootstrap</command> puis
<command>./configure --enable-v4l
--with-ffmpeg=PATH</command> (avec <emphasis>PATH</emphasis> le chemin
......
......@@ -34,9 +34,9 @@
<li><a href="http://download.videolan.org/pub/videolan/vls/0.5.6/contrib"><i>browse the list</i></a></li>
</ul>
<h2>CVS</h2>
<h2>SVN</h2>
<p> Find more about the CVS repository on the <a
<p> Find more about the SVN source code repository on the <a
href="http://developers.videolan.org/">developers website</a>. </p>
<h2>Older versions</h2>
......
......@@ -158,9 +158,9 @@
<h3>Access / muxer matrix</h3>
<h3>Output method / muxer matrix</h3>
<p></p>
<p>This table describes what type of muxing is allowed when streaming to certain output methods. <b>Example:</b> PS muxing can only be done when you write to HTTP or files, and when you want to use UDP, you can only mux in TS or as RAW.</p>
<table border="0">
......@@ -169,6 +169,7 @@
<td class="matrixhead">UDP</td>
<td class="matrixhead">RTP</td>
<td class="matrixhead">HTTP</td>
<td class="matrixhead">MMSH</td>
<td class="matrixhead">File</td>
</tr>
......@@ -177,6 +178,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -185,6 +187,7 @@
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -193,6 +196,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -202,6 +206,7 @@
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr>
......@@ -209,6 +214,16 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="category">QuickTime</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -217,6 +232,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -225,6 +241,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -234,7 +251,7 @@
<h3>Muxer / audio and video formats matrix</h3>
<p></p>
<p>This table describes which video and audio formats VLC can output, and how these can be muxed. <b>Example: </b> MPEG4 can be muxed in any way, however if you want to stream Window Media Video, then you cannot use PS, MP4 or RAW muxing.</p>
<table border="0">
......@@ -246,18 +263,20 @@
<td class="matrixhead">Ogg</td>
<td class="matrixhead">ASF</td>
<td class="matrixhead">MP4</td>
<td class="matrixhead">MOV</td>
<td class="matrixhead">AVI</td>
<td class="matrixhead">Raw</td>
</tr>
<tr>
<td class="category" rowspan="7"><b>Video formats</b></td>
<td class="category" rowspan="8"><b>Video formats</b></td>
<td class="type">MPEG-1 video</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -269,6 +288,7 @@
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -282,6 +302,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
<tr>
......@@ -291,6 +312,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
</tr>
......@@ -302,6 +324,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
</tr>
......@@ -313,6 +336,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
</tr>
......@@ -324,8 +348,21 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
</tr>
<tr>
<td class="type">Theora</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
<tr>
......@@ -336,6 +373,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -347,6 +385,7 @@
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -358,6 +397,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -371,6 +411,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
<tr>
......@@ -381,6 +422,7 @@
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="yes">Yes</td>
</tr>
......@@ -433,9 +475,14 @@ interoperable).</p>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="type">Theora</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="category" rowspan="5"><b>Audio formats</b></td>
<td class="category" rowspan="6"><b>Audio formats</b></td>
<td class="type">MPEG Layer 2 audio</td>
<td class="yes">Yes</td>
</tr>
......@@ -457,7 +504,12 @@ interoperable).</p>
</tr>
<tr>
<td class="type">Vorbis</td>
<td class="type">Vorbis/Speex</td>
<td class="yes">Yes</td>
</tr>
<tr>
<td class="type">FLAC</td>
<td class="yes">Yes</td>
</tr>
......@@ -483,6 +535,9 @@ interoperable).</p>
<th class="os"><a href="/streaming/download-vls-windows.html">
<img src="/images/icons/windows.gif" alt="Windows" width="32" height="32" />
</a></th>
<th class="os"><a href="/vlc/download-macosx.html">
<img src="/images/icons/macosx.gif" alt="Mac OS X" width="32" height="32" />
</a></th>
</tr>
......@@ -493,6 +548,7 @@ interoperable).</p>
<td class="type">File</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -501,6 +557,7 @@ interoperable).</p>
<td class="type">DVD</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -509,6 +566,7 @@ interoperable).</p>
<td class="type">DVB-S (Hauppauge Nova-S / Nexus)</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -517,6 +575,7 @@ interoperable).</p>
<td class="type">DVB-C (Hauppauge DVB-C)</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -525,6 +584,7 @@ interoperable).</p>
<td class="type">DVB-T (Hauppauge Nova-t)</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -533,13 +593,15 @@ interoperable).</p>
<td class="type">MPEG encoding card [4]</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
<tr>
<td class="type">ASI card</td>
<td class="partial">CVS Only</td>
<td class="partial">SVN Only</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -547,7 +609,8 @@ interoperable).</p>
<tr>
<td class="type">V4L device</td>
<td class="partial">CVS Only</td>
<td class="partial">SVN Only</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -558,6 +621,7 @@ interoperable).</p>
<td class="type">UDP Unicast / Multicast</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -566,6 +630,7 @@ interoperable).</p>
<td class="type">File</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -575,6 +640,7 @@ interoperable).</p>
<td class="type">TS</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -583,6 +649,7 @@ interoperable).</p>
<td class="type">PS</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -593,6 +660,7 @@ interoperable).</p>
<td class="type">TS</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -602,6 +670,7 @@ interoperable).</p>
<td class="type">Command line</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -610,6 +679,7 @@ interoperable).</p>
<td class="type">Telnet</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
<td class="yes">Yes</td>
</tr>
......@@ -619,6 +689,7 @@ interoperable).</p>
<td class="type">IPv6</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -627,6 +698,7 @@ interoperable).</p>
<td class="type">Send DVD subtitles</td>
<td class="yes">Yes</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -635,6 +707,7 @@ interoperable).</p>
<td class="type">Send SAP announces</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......@@ -643,6 +716,7 @@ interoperable).</p>
<td class="type">Transcoding</td>
<td class="no">No</td>
<td class="no">No</td>
<td class="no">No</td>
</tr>
......
......@@ -14,15 +14,17 @@
<ul>
<li><a href="/vlc">VLC media player</a> (initially VideoLAN Client),
which can be used as a server to
stream MPEG-1, MPEG-2 and MPEG-4 / DivX files, DVDs and live videos on
the network in unicast or multicast; or used as a client to receive,
decode and display MPEG streams under multiple operating systems,</li>
<li>VLS (VideoLAN Server), which can stream MPEG-1, MPEG-2 and
MPEG-4 files, DVDs, digital satellite channels, digital terrestial
television channels and live videos on the network in unicast or
multicast,</li>
<li>VLC (initially VideoLAN Client), which can be used as a server to
stream MPEG-1, MPEG-2 and MPEG-4 / DivX files, DVDs and live videos on
the network in unicast or multicast; or used as a client to receive,
decode and display MPEG streams under multiple operating systems.</li>
multicast. Most of the VLS functionality can now be found in the much
better VLC program. Usage of VLC instead of VLS is advised.</li>
</ul>
......@@ -33,16 +35,17 @@ decode and display MPEG streams under multiple operating systems.</li>
alt="VideoLAN solution overview" width="800" height="369" />
</p>
<p>VLC's stream output works under Linux, Windows, Mac OS X, BeOS
and many Unices. VLS works under Linux, Windows and Mac OS X.
For more information on VLC's stream output and VLS, see the <a
href="features.html">streaming features page</a>.</p>