From 8dbeccf18cce9ad626636662fd9f0430f7f63963 Mon Sep 17 00:00:00 2001
From: gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 28 May 2001 19:16:06 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@900 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/Hungarian/MPlayer-FAQ |  3 +++
 DOCS/MPlayer-FAQ           |  3 +++
 DOCS/TODO                  |  1 +
 DOCS/mplayer.1             | 12 +++++++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/DOCS/Hungarian/MPlayer-FAQ b/DOCS/Hungarian/MPlayer-FAQ
index 5807a6d181..e824b777ff 100644
--- a/DOCS/Hungarian/MPlayer-FAQ
+++ b/DOCS/Hungarian/MPlayer-FAQ
@@ -225,3 +225,6 @@ Q: Az MPlayer "MPlayer interrupted by signal 4 in module: decode_video"
    üzenettel leáll.
 A: Azon a gépen futtasd az MPlayer-t, amin lefordítottad! Vagy fordítsd újra!
    Semmiképp se használd másik processzoron, mint amin lefordítottad!
+
+Q: Gondjaim vannak az icewm-el es a teljeskepernyos xv moddal..
+A: Tudjuk, az icewm szar.
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index eb93f1c278..135bb0f1af 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -217,3 +217,6 @@ A: Maybe. But you better look for already existant MPEG players on that
 Q: MPlayer dies with "MPlayer interrupted by signal 4 in module: decode_video".
 A: Try running MPlayer on the machine you compiled on. Or recompile. Don't
    use MPlayer on different CPU than it was compiled on.
+
+Q: I have problems with icewm and fullscreen xv mode..
+A: Known problem, icewm sucks.
diff --git a/DOCS/TODO b/DOCS/TODO
index dc809dfee5..bde52ec064 100644
--- a/DOCS/TODO
+++ b/DOCS/TODO
@@ -12,6 +12,7 @@ Medium Priority:
 - show current frame number [Gabucino]
 - seek_to_frame and seek_to_index options
 - audio copy/encoding capability
+- support SSA subtitles : http://www.eswat.demon.co.uk
 
 Low Priority:
 - fix X4.0.x/DRI OpenGL - DONE?  mga works with 4.0.3
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 48a379d9f4..26275d3219 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -294,8 +294,14 @@ Fonts are searched in $HOME/.mplayer/font. There must be a font.desc
 file, and files with .RAW extension.
 .TP
 .I SUBTITLE FILES
-Sub files are searched in $HOME/.mplayer/sub, and in the directory
-of the movie. (TODO)
+MPlayer currently supports 6 subtitle formats : MicroDVD, SubRip, unnamed,
+SAMI (smi), vplayer, RealMedia RT.
+Sub files are searched in this priority : (for example /mnt/cdrom/movie.avi)
+    /mnt/cdrom/movie.sub
+        (SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT)
+    $HOME/.mplayer/sub/movie.sub
+        (SUB/srt/SRT/smi/SMI/rt/RT/txt/TXT)
+    $HOME/.mplayer/default.sub
 .IP
 .SH "EXAMPLES"
 Just launch it! :)
@@ -305,7 +311,7 @@ Probably. Check DOCS.
 
 Bugreports should be addressed to the MPlayer-users mailing list
 (mplayer-users@lists.sourceforge.net) ! If you want to submit a bugreport
-(which we love to receive!), please double-check the README, and
+(which we love to receive!), please double-check the DOCS/BUGREPORTS, and
 tell us all that we need to know to identify your problem.
 
 .LP