*** empty log message ***

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2869 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 28 insertions, 6 deletions

diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 3422172d4b..805ed38183 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -182,7 +182,22 @@ cyrillic, korean fonts, and OSD?</P>
 
 <P><B>MPlayer</B> is basically GPL, but contains some non-GPL code which is not
 allowed to be distributed in binary form, and also contains the OpenDivX
-library which has special license.</P>
+library which has special license. We are still developing towards GPL.</P>
+
+<P><B><I>Important notice</I></B></P>
+
+<P><B>MPlayer CAN'T BE DISTRIBUTED IN BINARY FORM !</B> Due to the fact, that
+EVERY optimization flag is determined during compile time.</P>
+
+<P>An optimized, compiled <B>MPlayer</B> is <U>very unlikely</U> to work on another computer.<BR>
+An unoptimized, compiled <B>MPlayer</B> may work, but will be <U>sluggish</U>.</P>
+
+<P>If you are <B>using</B> a self-made binary package, that's ok.<BR>
+If you are <B>distributing</B> a binary package, that's <B>forbidden</B>!<BR>
+If you have <B>downloaded and using</B> a binary package made by someone else,
+then please inform us.</P>
+
+<P><B><I>Important notice ends</I></B></P>
 
 <P>I didn't write any codecs, just some players. I spent
 a lot of time finding the best way to parse bad damaged input files
@@ -315,6 +330,9 @@ see the <A HREF="encoding.html#2.4">MEncoder section</A> .</LI>
 
 <LI>If you want to play <B>3ivx</B> movies, check the <A HREF=codecs.html#2.2.1.3>
 XAnim codecs section</A>.</LI>
+
+<LI>If you have a V4L compatible <B>TV tuner</B> card, and wish to watch/grab and
+encode movies with <B>MPlayer</B>, read the <A HREF=#2.5>TV input</A> section.</LI>
 </UL>
 
 <P>Then build <B>MPlayer</B>:</P>
@@ -460,11 +478,13 @@ Now you have to see a timer at the upper left corner of the movie
 <P><A NAME=2.4>2.4. <A HREF="encoding.html">MEncoder - An All-Purpose Encoder</P>
 
 
-<P><A NAME=2.5><B>2.4. TV input</B></P>
+<P><A NAME=2.5><B>2.5. TV input</B></P>
 
 <P>This section is about how to enable <B>watching/grabbing from V4L compatible
 TV tuner</B>.</P>
 
+<P><B><I>Compilation</I></B></P>
+
 <P>
 <UL>
   <LI>first, you have to add the <CODE>--enable-tv</CODE> flag to <CODE>./configure</CODE>,
@@ -475,7 +495,7 @@ TV tuner</B>.</P>
 </P>
 
 <P><B><I>Available options</I></B><BR>
-<TABLE>
+<TABLE BORDER=0>
 <TR>
   <TD>&nbsp;&nbsp;</TD>
   <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2><I>on</I></TD>
@@ -484,7 +504,7 @@ TV tuner</B>.</P>
   input</TD>
 </TR>
 <TR>
-  <TD></TD>
+  <TD>&nbsp;&nbsp;</TD>
   <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2><I>driver</I></TD>
   <TD></TD>
   <TD><FONT face="Verdana, Arial, Helvetica, sans-serif" size=2>
@@ -554,9 +574,10 @@ TV tuner</B>.</P>
 
 <P>
 Dummy output, to AAlib :)<BR>
-<CODE>mplayer -tv on:driver=dummy:width=640:height=480</CODE><BR>
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mplayer -tv on:driver=dummy:width=640:height=480 -vo aa</CODE><BR>
+<BR>
 Input from standard V4L<BR>
-<CODE>mplayer -tv on:driver=v4l:width=800:height=600:device=/dev/video0:input=television:outfmt=yv12 -vc rawyv12 -vo xv</CODE><BR>
+<CODE>&nbsp;&nbsp;&nbsp;&nbsp;mplayer -tv on:driver=v4l:width=800:height=600:device=/dev/video0:input=television:outfmt=yv12 -vc rawyv12 -vo xv</CODE><BR>
 </P>
 
 
@@ -923,6 +944,7 @@ Anyone has closer info?</P>
   <LI>vo_ggi output driver in libvo (www.ggi-project.org)</LI>
   <LI>xanim codecs support (incomplete yet!)</LI>
   <LI>VIVO files support</LI>
+  <LI>TV grabbing support</LI>
 </UL></LI>
 
 <LI><B><A HREF="mailto:asackerm@stud.informatik.uni-erlangen.de">Andreas Ackermann (Acki)</A></B>