*** empty log message ***

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

5 files changed, 67 insertions, 13 deletions

diff --git a/DOCS/AUTHORS b/DOCS/AUTHORS
index d7f2ada204..23c8728f05 100644
--- a/DOCS/AUTHORS
+++ b/DOCS/AUTHORS
@@ -29,7 +29,7 @@ Gábor Lénárt (LGB): <lgb@lgb.hu>
 - testing and some improvements in mpeg player's user interface (options)
 - ./configure script improvements
 - Makefile improvements
-- preliminary DVD support
+- prelimenary DVD support
 
 Gábor Bérczi (Gabucino):  <gabucino@k2.jozsef.kando.hu>
 - documentation maintainer, hun-eng translator
@@ -74,6 +74,10 @@ Jens Hoffmann: <hoffmajs@gmx.de>
 - Additional YUV formats support
 - found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization
 
+Nick Kurshev: <nickols_k@mail.ru>
+- memcpy optimizations for AMD K7 and Intel Pentium III
+- CDROM tune info
+
 Main testers:
   Tibor Balázs (Tibcu)
   Péter Sasi (SaPe)
diff --git a/DOCS/CDROM b/DOCS/CDROM
new file mode 100644
index 0000000000..f45cb883b2
--- /dev/null
+++ b/DOCS/CDROM
@@ -0,0 +1,45 @@
+
+Tune up CDROM
+~~~~~~~~~~~~~
+
+Introduction
+~~~~~~~~~~~~
+>From Linux documentation:
+
+Some CDROM drives are capable of changing their head-speed. There are several
+reasons for changing the speed of a CDROM drive. Badly pressed CDROMs may
+benefit from less-than-maximum head rate. Modern CDROM drives can obtain very
+high head rates (up to 24-times is common).  It has been reported that these
+drives can make reading errors at these high speeds, reducing the speed can
+prevent data loss in these circumstances.  Finally, some of these drives can
+make an annoyingly loud noise, which a lower speed may reduce.
+
+Howto
+~~~~~
+The recommended way to do it is with a program called 'setcd' . It's kinda
+old, but won't be too hard to find on the Net.
+Use it with :
+	setcd -x <speed> <cdrom device>
+
+Also you can try :
+	echo current_speed:4 >/proc/ide/<cdrom device>/settings
+but you'll need root privileges. (It didn't work for me - Gabucino)
+
+I use following command too :
+	echo file_readahead:2000000 >/proc/ide/<cdrom device>/settings
+for 2MB prefetched reading from the file (it's useful for scratched CDROMs).
+
+It's recommended that you tuneup your CDROM drive also with hdparm:
+
+hdparm -d1 -a8 -u1 <cdrom device>
+to enable using DMA access, readahead, and IRQ unmasking.
+(if you don't understand these, *read the hdparm manpage*)
+
+Final words
+~~~~~~~~~~~
+Please refer to "/proc/ide/<cdrom device>/settings" for fine-tuning your CDROM.
+
+	Nick Kurshev & Gabucino
+	  <nickols_k@mail.ru>
+
+
diff --git a/DOCS/SOUNDCARDS b/DOCS/SOUNDCARDS
index 5ae42ea32e..bd21bed299 100644
--- a/DOCS/SOUNDCARDS
+++ b/DOCS/SOUNDCARDS
@@ -2,15 +2,17 @@
 Recommendations for misc. soundcards
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Aureal Vortex 2:        In config.h, change #define HAVE_AUDIO_SELECT to
-			  #undef HAVE_AUDIO_SELECT or run 
-			  ./configure script with --disable-select option
-			  
-ALSA with GUS PnP:	see Aureal Vortex2
+Aureal Vortex 2:
+			run ./configure script with --disable-select option
+
+GUS PnP:
+			OSS	: OK (?)
+			ALSA	: see Aureal Vortex2
+			Max kHz	: 48 (?)
 
 SB Live!:
 			OSS	: OK
-			ALSA	: (untested)
+			ALSA	: (?)
 			Max kHz : 48
 
 Gravis UltraSound ACE:
@@ -20,7 +22,7 @@ Gravis UltraSound ACE:
 
 Gravis UltraSound MAX:
 			OSS     : OK
-			ALSA    : OK (should be)
+			ALSA    : OK (?)
 			Max kHz : 48
 
 ESS 688 and probably all old SB's (without buffers):
@@ -37,13 +39,12 @@ PC Speaker or DAC:
 
  - MPlayer is mostly intended for OSS
  - use at least 2.4 if possible, 2.2 isn't tested
- - In case of any problems, first try to change "#define HAVE_AUDIO_SELECT" to
-   "#undef HAVE_AUDIO_SELECT" in config.h , and recompile!
-   (make distclean ; make)
+ - In case of any problems, first try recompiling with
+   ./configure --disable-select , then make distclean ; make .
    Your soundcard may not support querying of its buffer.
  - if sound clicks when playing from CD-ROM, turn on IRQ unmasking !
    for example "hdparm -u1 /dev/cdrom" (see "man hdparm" !!!)
-   This is also recommended anyways... (for XMMS, etc...)
+   This is recommended anyways... (for XMMS, etc...)
  - don't use your soundcard by other application ( for ex. XMMS ) !
    if you use ESD, start MPlayer with the esddsp utility !
  - Please tell us how MPlayer and your soundcard(s) worked together!
diff --git a/DOCS/example.conf b/DOCS/example.conf
index fd7520fe54..cdb05a97f8 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -71,6 +71,9 @@ ffactor = 0.75
 ## m, M : means multiply by 1.000.000
 ##
 
+# fb = /dev/fb0				# framebuffer device to use
+# fbmode = 640x480-120			# use this mode (read from fb.modes!)
+# fbmodeconfig = /etc/fb.modes		# the fb.modes file
 # monitor_hfreq = 31.5k-50k,70k		# horizontal frequency range
 # monitor_vfreq = 50-90			# vertical frequency range
 # monitor_dotclock = 30M-300M		# dotclock (or pixelclock) range
@@ -79,7 +82,7 @@ ffactor = 0.75
 ## Specify DVD device (you need to install libcss, then recompile mplayer!)
 ##
 
-dvd = /dev/dvd
+# dvd = /dev/dvd
 
 ##
 ## You can also include other configfiles
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 6c25eb0abd..da515cb042 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -114,6 +114,7 @@ use/display this subtitle file
 .TP
 .B \-subfps\ rate
 specify frame/sec rate of subtitle file
+(ONLY for frame-based SUB files, i.e. NOT MicroDVD format!)
 (default: the same as the movie)
 .TP
 .B \-subdelay\ sec