*** empty log message ***

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

7 files changed, 35 insertions, 7 deletions

diff --git a/DOCS/Hungarian/documentation.html b/DOCS/Hungarian/documentation.html
index ab3fd4aa72..3a6a4b6c87 100644
--- a/DOCS/Hungarian/documentation.html
+++ b/DOCS/Hungarian/documentation.html
@@ -31,7 +31,7 @@
 	</LI><LI><A HREF="codecs.html#2.1.4">2.1.4 Hogyan használj ismeretlen Win32 codec-et</A></LI>
 	     <UL><LI><A HREF="codecs.html#2.1.4.1">2.1.4.1 VFW</A></LI>
 	     <LI><A HREF="codecs.html#2.1.4.2">2.1.4.2 DirectShow</A></LI>
-	     </UL>
+	     </UL></UL></LI>
     </LI><LI><A HREF="video.html">2.2 Video és audio kimeneti eszközök</A>
 	<UL><LI><A HREF="video.html#2.2.1">2.2.1 Video kimenetek</A>
 	     <UL><LI><A HREF="video.html#2.2.1.1">2.2.1.1 MTRR</A>
@@ -64,11 +64,11 @@
 	     </LI><LI><A HREF="video.html#2.2.1.11">2.2.1.11 AAlib - szöveges módú megjelenítés</A>
 	     </LI><LI><A HREF="video.html#2.2.1.A">2.2.1.A TV kimenet</A>
 		     </LI><UL><LI><A HREF="video.html#2.2.1.A.1">2.2.1.A.1 Matrox TV kimenet</A>
-	     </UL>
+	     </UL></UL></LI>
 	</LI><LI><A HREF="sound.html#2.2.2">2.2.2 Hangkártyák, audio kimenetek</A>
 	     <UL><LI><A HREF="sound.html#2.2.2.1">2.2.2.1 Ajánlott beállítások különféle hangkártyákhoz</A>
 	     </LI></UL>
-	</LI></LI>
+	</LI></LI></UL></LI></UL></LI></UL></LI></UL></LI>
 </LI><LI><A HREF="#3">3. Használat</A>
      <UL><LI><A HREF="#3.1">3.1 Irányítás billentyűzetről</A>
      </LI><LI><A HREF="#3.2">3.2 Irányítás LIRC-cel (Linux Infrared Remote Control)</A>
diff --git a/DOCS/Hungarian/faq.html b/DOCS/Hungarian/faq.html
index cbd9d32956..94335c251e 100644
--- a/DOCS/Hungarian/faq.html
+++ b/DOCS/Hungarian/faq.html
@@ -470,6 +470,18 @@ Ennek több oka is lehet.<BR>
      van ágyazva a QT programba, ergo lehetetlen felhasználni.
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
+<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Mikor lesz &lt;szabadonválasztott képmegjelenítéssel kapcsolatos&gt; képessége az MPlayernek?
+</B></TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Várd meg amíg a libvo2 elkészül.
+</TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
+
+<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Tudok hangot tömöríteni a <I>-vo odivx</I> opcióval?
+</B></TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Nem tudsz. Majd lesz ilyen, addigis várj türelmesen.
+</TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
+
 </TABLE>
 
 </BODY>
diff --git a/DOCS/Hungarian/video.html b/DOCS/Hungarian/video.html
index 1ba77d1ebc..1f76bf1e1e 100644
--- a/DOCS/Hungarian/video.html
+++ b/DOCS/Hungarian/video.html
@@ -39,7 +39,7 @@
 <TD>&nbsp;&nbsp;</TD><TD VALIGN=top>png</TD><TD>&nbsp;&nbsp;</TD><TD>kimenet PNG file-okba (-z kapcsoló a tömörítés mértékét állítja)</TD><TR>
 <TD></TD><TD VALIGN=top>pgm</TD><TD></TD><TD>kimenet PGM file-okba (tesztelésre, vagy ffmpeg enkódoláshoz)</TD><TR>
 <TD></TD><TD VALIGN=top>md5</TD><TD></TD><TD>MD5sum támogatás (MPEG konformancia tesztekhez)</TD><TR>
-<TD></TD><TD VALIGN=top>odivx</TD><TD></TD><TD>OpenDivX AVI file output (-br a bitrate-et állítja)</TD><TR>
+<TD></TD><TD VALIGN=top>odivx</TD><TD></TD><TD>OpenDivX AVI file output (-br a bitrate-et állítja) (NEM TUDSZ vele hangot tömöríteni!)</TD><TR>
 <TD></TD><TD VALIGN=top>null</TD><TD></TD><TD>kimenet a nagy semmibe (sebességtesztekhez)</TD><TR>
 </TABLE>
 
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 7dd98a0665..0dacdc12c3 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -66,11 +66,11 @@
 	     </LI><LI><A HREF="video.html#2.2.1.11">2.2.1.11 AAlib - text mode displaying</A>
 	     </LI><LI><A HREF="video.html#2.2.1.A">2.2.1.A TVout</A>
 		     <UL><LI><A HREF="video.html#2.2.1.A.1">2.2.1.A.1 Matrox Dualhead</A>
-	     </UL></LI>
+	     </UL></LI></UL></LI>
 	</LI><LI><A HREF="sound.html#2.2.2">2.2.2 Soundcards, audio output devices</A>
 	     <UL><LI><A HREF="sound.html#2.2.2.1">2.2.2.1 Soundcard experiences, recommendations</A>
 	     </LI></UL>
-	</LI>
+	</LI></UL></LI></UL></LI>
 </LI><LI><A HREF="#3">3. Usage</A>
      <UL><LI><A HREF="#3.1">3.1 Control from keyboard</A>
      </LI><LI><A HREF="#3.2">3.2 Control from LIRC (Linux Infrared Remote Control)</A>
diff --git a/DOCS/faq.html b/DOCS/faq.html
index 6039afaa06..6f651bb454 100644
--- a/DOCS/faq.html
+++ b/DOCS/faq.html
@@ -460,6 +460,18 @@ encoded, and that codec is built-in deep in the QT executable, there's
 no way to use it.
 </TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
 
+<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+When will be &lt;your favourite video feature&gt; (like subtitle placement) implemented?
+</B></TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Wait for libvo2.
+</TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
+
+<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%><B><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+Can I/When will I be able to encode audio with <I>-vo odivx</I> ?
+</B></TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD><font face="Verdana, Arial, Helvetica, sans-serif" size="2">
+No you can't right now. It's planned, so just wait patiently.
+</TD><TR><TD COLSPAN=3>&nbsp;</TD><TR>
+
 </TABLE>
 
 </BODY>
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index f0e7d4b851..18f82bbe09 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -404,6 +404,10 @@ used with '-vo odivx' .
 Specifies the bitrate to encode OpenDivx at
 (in bits! e.g: 780000).
 .TP
+.I NOTE
+You CAN'T encode sound, only video right now! Don't ask for it,
+it's on the TODO list.
+.TP
 .B \-encode\ file
 used with '-vo odivx' .
 Specifies the output OpenDivX file. Won't overwrite.
diff --git a/DOCS/video.html b/DOCS/video.html
index 8d2369a54a..0bc858595c 100644
--- a/DOCS/video.html
+++ b/DOCS/video.html
@@ -39,7 +39,7 @@ broken)</TD><TR>
 <TD>&nbsp;&nbsp;</TD><TD VALIGN=top>png</TD><TD>&nbsp;&nbsp;</TD><TD>PNG files output (use -z switch to set compression)</TD><TR>
 <TD></TD><TD VALIGN=top>pgm</TD><TD></TD><TD>PGM files output (for testing purposes or ffmpeg encoding)</TD><TR>
 <TD></TD><TD VALIGN=top>md5</TD><TD></TD><TD>MD5sum output (for MPEG conformance tests)</TD><TR>
-<TD></TD><TD VALIGN=top>odivx</TD><TD></TD><TD>OpenDivX AVI File writer (use -br to set encoding bitrate)</TD><TR>
+<TD></TD><TD VALIGN=top>odivx</TD><TD></TD><TD>OpenDivX AVI File writer (use -br to set encoding bitrate) (<B>WITHOUT SOUND</B>!)</TD><TR>
 <TD></TD><TD VALIGN=top>null</TD><TD></TD><TD>Null output (for speed tests/benchmarking)</TD><TR>
 </TABLE>