reviewed for release

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

10 files changed, 107 insertions, 81 deletions

diff --git a/DOCS/AUTHORS b/DOCS/AUTHORS
index 23c8728f05..3040363c94 100644
--- a/DOCS/AUTHORS
+++ b/DOCS/AUTHORS
@@ -15,10 +15,11 @@
 - hacking DivX/Mpeg4 VfW codecs to get YUV output
 - opendivx decoder speed optimizations (see opendivx/ChangeLog)
 - OSD & SUB display code
+- everything that isn't listed elsewhere
 
 Zoltán Ponekker (Pontscho/Fresh!):  <pontscho@makacs.poliod.hu> 
 - configure script and Makefiles for easy compile
-- GUI system (coming soon!)
+- GUI system (/still/ coming soon!)
 - 3DNow! support into mp3lib
 - 3DNow! support into fastmemcpy.h
 - various X11 driver changes (keyboard handling, fullscreen, bpp detect, etc)
@@ -106,7 +107,7 @@ Michael Hipp:
 - mpg123 author   [free mpeg audio player, isn't used directly but in mp3lib]
 
 Mark Podlipec:
-- xanim author    [i'm using its aLaw audio decoder]
+- xanim author    [I'm using its aLaw audio decoder]
 
 Jutta Degener and Carsten Bormann:
 - xa_gsm.c authors  [MS-GSM audio codec]
diff --git a/DOCS/CODECS b/DOCS/CODECS
index 57d63d6e51..c2e7bd8fc2 100644
--- a/DOCS/CODECS
+++ b/DOCS/CODECS
@@ -46,7 +46,7 @@ Problems:
 - Indeo Video 3.2:  (IV32)
   ir32_32.dll: works, no YUV, image upside-down
 - ASUS ASV2: (ASV2)
-  asusasv2.dll: loads, image upside-down and very pixelized (no YUY2, but YVYU)
+  asusasv2.dll: works, image upside-down on RGB (YUV ok!)
 - ATI VCR1:  (VCR1)
   ativcr1.dll: can't load (16-bit DLL)
 - TrueMotion 2.0:  (TM20)
@@ -67,8 +67,6 @@ Not tested:
   icmw_32.dll: not tested (no sample file)
 - Indeo Video 3.1:  (IV31)
   ir32_32.dll: not tested (no sample file)
-- AngelPotion MPEG-4: (AP41,AP42)
-  APmpg4v1.dll: not tested
 - Windows Media Video 8 (WMV2)
   wmv8ds32.ax: not tested (no sample file)
 - I420: (I420)
diff --git a/DOCS/ChangeLog b/DOCS/ChangeLog
index 1dbcc12877..4dccfc5786 100644
--- a/DOCS/ChangeLog
+++ b/DOCS/ChangeLog
@@ -2,7 +2,10 @@
 ChangeLog:
 ~~~~~~~~~~
 
-*** 0.11 release is coming SOON!??? ***
+v0.12 "IdegCounter" :
+  - TODO, A'rpi
+
+* v0.11 skipped, renamed to 0.12 *
 
 v0.11-pre27-CVS:
   - updated libmpeg2 source to libmpeg2-0.2.1-CVS version
diff --git a/DOCS/DVD b/DOCS/DVD
index 4a3bab569b..01b04124d9 100644
--- a/DOCS/DVD
+++ b/DOCS/DVD
@@ -27,7 +27,7 @@ Second, you must call ./configure script of MPlayer with these options:
 --withcssindfir=/usr/local/include
 	Directory contains header file 'css.h' of libcss.
 
-NOTE: There is no autodetection for libcss! You must require it with
+NOTE: Currently there is no autodetection for libcss! You MUST specify it with
 configure options.
 
 Viewing VOB files directly from DVD
@@ -36,17 +36,17 @@ mplayer -dvd /dev/dvd /mnt/cdrom/video_ts/vts_01_1.vob
 
 where,
 
-	'-dvd /dev/dvd' tells mplayer the device name of your DVD drive.
+	'-dvd /dev/dvd' tells MPlayer the device name of your DVD drive.
 	it's used in disc authentication process
 
 	the filename is simply a VOB file path on the disc
 
-Note that according my experiences disc authentication requires root
-privilegies so you must run mplayer as root! (see section 'Problems').
+Note that according to my experiences, disc authentication requires root
+privileges so you must run MPlayer as root! (see section 'Problems').
 
 NOTE about the sound:
-	It seems that mplayer sometimes fails to find the first audio stream.
-	You can specify it with using the '-aid 128' option, for example.
+	It seems that MPlayer sometimes fails to find the first audio stream.
+	You can specify it with the '-aid 128' option, for example.
 	Please experience with 128,129 and similar values. See section
 	'Problems'.
 
@@ -54,15 +54,15 @@ NOTE about the sound:
 New source files
 ~~~~~~~~~~~~~~~~
 dvdauth.c
-	Issues DVD disc and title authentication and fills key_disc and key_title
-	arraies.
+	Issues DVD disc and title authentication and fills key_disc and
+	key_title arraies.
 
 dvdauth.h
 	header file
 
-These files are embeded inside an '#ifdef ... #endif' block, so if libcss
+These files are embedded inside an '#ifdef ... #endif' block, so if libcss
 support was not requested, they do not produce any code and of course
-libcss is not linked against mplayer either.
+libcss is not linked against MPlayer either.
 
 
 Modifications in the source
@@ -83,8 +83,8 @@ On my AMD K6-2 with using hw scaling and colorspace conversion
 capability of my G400 it's possible to watch DVD with about 70%
 CPU usage with '-nosound'. Unfortunately with sound my machine is
 not enough :( Maybe it can be improved somewhat ...
-Guess, it's not so bad ... According reports from my friends
-xine uses 80-90% CPU to play DVD on much more powerfull machines
+Guess, it's not so bad ... According to reports from my friends
+xine uses 80-90% CPU to play DVD on much more powerful machines
 like 1GHz Athlon systems (as far as I know, it's said that about
 300MHz celeron is the minimum to watch DVDs ... using windows
 DVD viewers).
@@ -99,13 +99,12 @@ Problems (TODO)
 ~~~~~~~~~~~~~~~
 * disc authentication (the FIBMAP ioctl) requires root privilegies.
   this is strange since OMS can do it as user too.
-* sound. I'm using my only DVD disc (The Matrix) to test mplayer.
-  some VOB file has English sound, some has Spanish and some has
+* sound. I'm using my only DVD disc (The Matrix) to test MPlayer.
+  some VOB file have English sound, some have Spanish and some have
   no sound at all.
   IT SEEMS that if I give '-aid 128' everything works with English sound ...
-* strange effects but only with SOME vob
-  files (it looks like some interlacing effect, eg: every 2nd line
-  on the screen is from the last frame).
+* strange effects but only with SOME vob files (it looks like some interlacing
+  effect, eg: every 2nd line on the screen is from the last frame).
 
 
 feature TODO
diff --git a/DOCS/DVD-FAQ b/DOCS/DVD-FAQ
index de7171fd7a..c98f636454 100644
--- a/DOCS/DVD-FAQ
+++ b/DOCS/DVD-FAQ
@@ -1,27 +1,31 @@
 Q: I have some problem not mentioned here ...
 A: Read file 'DVD' as well.
 
-Q: How can I actually watch DVD with mplayer?
-A: Ehh. Goes on reading this file as well as 'DVD' (hint: you must have libcss)
+Q: How can I actually watch DVD with MPlayer?
+A: Ehh. Go on reading this file as well as 'DVD' (hint: you must have libcss)
+
+Q: So MPlayer can play DVDs? Then it must use DeCSS ! You are under arrest
+   under the XYZ#$ paragraph of the--
+A: Get back asshole, there is no DeCSS code in MPlayer. It links to libcss.
 
 Q: Seems to work but no sound.
-A: Use '-aid 128' (or try: 128,129,...) mplayer command line switch
+A: Use '-aid 128' (or try: 128,129,...) command line switch
 
 Q: I have got Spanish audio instead of English (or similar problems)
 A: See the last question/answer.
 
-Q: mplayer complains about FIBMAP or something.
-A: Try to run mplayer as root.
+Q: MPlayer complains about FIBMAP or something.
+A: Try to run MPlayer as root.
 
-Q: some strange effect (interlace like thing) mainly when fast moving objects
-   are shown in the movie
+Q: some strange effect (interlace like thing) especially when fast moving
+   objects are shown in the movie
 A: known problem, we try to fix it later
 
-Q: DVD support in mplayer is a piece of shit!
+Q: DVD support in MPlayer is a piece of shit!
 A: You're probably right :) However please contact us if you can improve it!
 
-Q: How can I compile mplayer to be able to watch DVDs?
-A: Read file 'DVD' (as usuall).
+Q: How can I compile MPlayer to be able to watch DVDs?
+A: Read file 'DVD' (as usual).
 
 Q: Where can I get libcss package from?
 A: Maybe from the source of OMS (www.livid.org).
diff --git a/DOCS/MPlayer-FAQ b/DOCS/MPlayer-FAQ
index f9f6953f19..3a92664b9f 100644
--- a/DOCS/MPlayer-FAQ
+++ b/DOCS/MPlayer-FAQ
@@ -14,7 +14,7 @@ Q: What about DVD playback?
 A: Read files 'DVD' and 'DVD-FAQ'.
 
 Q: SDL output doesn't work or compile. Problem is ....
-A: It is tested with SDL v1.1.8 (probably runs on 1.1.7 too).
+A: It is tested with SDL v1.2.0 (probably runs on 1.1.7+ too).
    It does NOT work with 1.1.6, 1.1.5 1.1.4 1.1.3 1.0.4 etc, don't ask.
 
 Q: I am still having trouble compiling with SDL support. gcc says something
@@ -26,7 +26,7 @@ A: Where did you install the SDL library? If you installed in /usr/local
 Q: I have problem ... with the SDL driver.
 A: It's very experimental & buggy code, and it's UNSUPPORTED by us.
    Please do NOT report bugs or ask features relating to SDL.
-   But you can improve it, and send us patches!
+   If you can improve it, send us patches!
 
 Q: It doesn't compile, and it misses uint64_t inttypes.h and similar things...
 A: copy DOCS/inttypes.h to MPlayer directory (cp DOCS/inttypes.h .)
@@ -35,7 +35,7 @@ A: copy DOCS/inttypes.h to MPlayer directory (cp DOCS/inttypes.h .)
 Q: I have Pentium III but ./configure doesn't detect SSE
 A: Only kernel versions 2.4.x supports SSE (or try latest 2.2.19 or newer)
 
-Q: fullscreen option (-fs) and/or -xy doesn't work with x11 driver (-vo x11)
+Q: -xy option doesn't work with x11 driver (-vo x11)
 A: x11 driver doesn't support scaling, but XF86VidMode support is now
    used: you must specify the -vm and the -fs switch, and you're done.
    Make sure you have the right Modelines in your XF86Config file, and
@@ -177,5 +177,11 @@ A: Your driver is old, update it. The new driver also supports YUY2 required
    for DivX.
 
 Q: I've downloaded an ASF with asfrecorder, but MPlayer can't play it !
-A: There were/are some known issues with asfrecorder, and the ASF format is
-   a big crap itself. Please contact us, so the bug can be fixed.
+A: asfrecorder, and the ASF format itself is a big crap.
+   Do not contact us, go to hell.
+
+Q: Umm, what is "IdegCounter" ?
+A: A mixture of a hungarian and an english word. In english, "Ideg" means
+   "nerve", and is pronounced as something like "ydaegh" . It was first used
+   to measure the nervousness of A'rpi, after some (umm) "mystic" disappearance
+   of CVS code ;)
diff --git a/DOCS/README b/DOCS/README
index 65936f1a36..2375ab98b4 100644
--- a/DOCS/README
+++ b/DOCS/README
@@ -1,5 +1,5 @@
-MoviePlayer v0.11        (C) 2000-2001. by Arpad Gereoffy  (A'rpi/ESP-team)
-=================           * See the file AUTHORS for the complete list! *
+MoviePlayer v0.12 "IdegCounter" (C) 2000-2001 Arpad Gereoffy (A'rpi/ESP-team)
+=============================== * See the file AUTHORS for the complete list *
 
 About:
 ~~~~~~
@@ -15,9 +15,12 @@ Short history:
 - mpg12play v0.1 has born, using libmpeg3 from www.heroinewarrior.com
 - mpg12play 2nd generation (v0.5-), using dvdview by Dirk Farin
 - mpg12play 3nd generation (v0.9-), using libmpeg2 (mpeg2dec) by Aaron Holtzman
-- mplayer has born, containing mpg12play 0.90pre5 and a new simple avi player
-- mplayer 0.10, mpeg and avi player in a single binary
-- mplayer 0.11: added .asf file support, and OpenDivX en/decoding
+- MPlayer has born, containing mpg12play 0.90pre5 and a new simple avi player
+- MPlayer 0.10, mpeg and avi player in a single binary
+- MPlayer 0.11: added .asf file support, and OpenDivX en/decoding
+- MPlayer 0.12 "IdegCounter"
+  The release version of the 0.11 development code. Far too many enhancements
+  to fit here (A'rpi?). Try it, and be amazed.
 
 As you see, I didn't write any codecs, just some players. But I spent
 a lot of time finding the best way to parse bad damaged input files
@@ -47,6 +50,7 @@ Supported input formats:
 - MPEG 1/2 System Stream (PS/VOB) and Elementary Stream (ES) file formats
 - RIFF AVI file format
 - ASF 1.0 file format
+- (De)crypted VOB files from DVD (experimental!)
 
 Supported audio & video codecs:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -80,7 +84,7 @@ Supported audio output devices:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - OSS driver
 - ALSA driver with OSS emulation (NOT recommended, causes annoying delays)
-- ESD with the esddsp utility (not tested)
+- ESD with the esddsp utility (not tested, not recommended, see ALSA)
 
 NOTE: check DOCS/SOUNDCARDS !
 
@@ -103,15 +107,22 @@ Usage:
     up or down      seek backward/forward 1 minute
     p or SPACE      pause movie (press any key to continue)
     q  or  ^C       stop playing and quit program
+    o               toggle OSD : none / seek / seek+timer
+    /  and *        decrease/increase volume
+    m               toggle using master/pcm channel for volume setting
 
   Examples:
     mplayer -vo x11 /mnt/Films/Contact/contact2.mpg
     mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
     mplayer -vcd 2 /dev/cdrom
+    mplayer -dvd /dev/dvd /mnt/dvd/matrix.vob
     mplayer -alsa -abs 65536 -delay -0.4 -nobps ~/movies/test.avi
 
-  Note:  for using Matrox YUV driver (-vo mga or xmga), you have to first
-         load the driver: insmod drivers/mga_vid.o
+  Note:  in order to use Matrox YUV driver (-vo mga or xmga), first you'll have
+         to load the driver: insmod drivers/mga_vid.o , or to make it automatic
+         insert the following line at the end of /etc/modules.conf:
+         alias char-major-178 mga_vid
+         and run 'depmod -a' .
 
 License:                                                                     
 ~~~~~~~~
@@ -180,7 +191,7 @@ Troubleshooting:
      support: ./configure --disable-gl (you have broken OpenGL headers/libs)
    - if you are a user, send us a bugreport (see above), including these:
       - output of ./configure
-      - output of make dep and make
+      - output of make
       - config.h and all of config.mak files
    Note: many users reported that SSE was not detected while running on P3.
    Current stable 2.2.x kernels does NOT support SSE, so you can't use it
@@ -215,7 +226,8 @@ Troubleshooting:
 
 7. sound-related problems:
    - maybe your card doesn't support 48kHz playback and the movie requires it.
-   - try player with the -noalsa option
+   - try MPlayer with the -noalsa option
+   - compile MPlayer with --disable-select
    - delayed audio with some AVI files: try with -bps or -nobps option!
    - if you experienced delayed audio, try to compensate with -delay or -abs.
      you can specify audio card's buffer size in bytes with -abs option, or
@@ -248,11 +260,11 @@ the following addresses:
 - MPlayer & Matrox G200/G400/G450 users: (about TV-out, mga_vid, syncfb, Xv)
 	http://lists.sourceforge.net/lists/listinfo/mplayer-matrox
 
-- MPlayer CVS-log:     (announce about _every_ CVS commits)
+- MPlayer CVS-log:     (announce about _every_ CVS commit)
 	http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
 
 Standard Disclaimer:
 ~~~~~~~~~~~~~~~~~~~~
-Use only at your own risk! There may be errors and inaccuracies that could 
-be damaging to your system or your eye. Proceed with caution, and although
-this is highly unlikely, I don't take any responsibility for that!
+Use only at your own risk! There may be errors and inaccuracies that could
+damage your system or your eye. Proceed with caution, and although this is
+highly unlikely, we don't take any responsibility for that!
diff --git a/DOCS/TODO b/DOCS/TODO
index fbab1dc81e..802951027b 100644
--- a/DOCS/TODO
+++ b/DOCS/TODO
@@ -1,30 +1,25 @@
 TO DO:
 ~~~~~~
 Urgent:
-- asterix.avi audio delays after 5-10 mins (bps mode only)
-- finish ASF seeking (find next keyframe)
-- fix DGA driver to work in 15/16 bpp (DONE??? - bpp switch workaround)
-- fix x11 driver to work without SHM (for remote playing etc)
-
-Fix compilation problems:
-- SDL version detection into ./configure - DONE (disabled :))
+- support for more codecs  (sample .avi files and .dll needed!) - HELP!
 
-Libvo features:
-- framebuffer and svgalib support (DONE)
-- real fullscreen (black bands at unused areas) support - DONE for xmga & x11
-- fix X4.0.x/DRI OpenGL (doesn't really work, at least mga & tdfx & nvidia)
+They Have Been Around For A Long Time:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+High Priority:
+- integrating the gui?
+- finish ASF seeking (find next keyframe)
+- seeking support for broken avi files without index chunk
+- support for MPEG TS (transport streams) and PES format (?) - I need
+  sample files!
+- audio copy/encoding capability
 
-Player features:
-- libcss support
-- subtitles (.sub files) & OSD support (DONE)
-- show movie length / position in percent (no, but there is a seekbar)
+Medium Priority:
+- fix x11 driver to work without SHM (for remote playing etc)
 - show current frame number [Gabucino]
 - seek_to_frame and seek_to_index options
 - fix mp3lib to avoid segfault with some damaged .avi files (workaround: -afm 4)
-- integrating the gui?
-- support for more codecs  (sample .avi files and .dll needed!) - HELP!
-- support for MPEG TS (transport streams) and PES format - I need sample files!
-- verify valid range of numeric options (like '-xy 0') - new configfile code?
-  (DONE)
-- audio copy/encoding capability
-- seeking support for broken avi files without index chunk
+
+Low Priority:
+- SDL version detection into ./configure - DONE (disabled :))
+- asterix.avi audio delays after 5-10 mins (bps mode only)
+- fix X4.0.x/DRI OpenGL (doesn't really work, at least mga & tdfx & nvidia)
diff --git a/DOCS/example.conf b/DOCS/example.conf
index cdb05a97f8..c936752c38 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -15,18 +15,18 @@ fs=yes			# Enlarges movie window to your desktop's size.
 			# Used by drivers: all
 
 vm=no			# Tries to change to a different videomode
-			# Used by drivers: dga2, x11 (, sdl?)
+			# Used by drivers: dga2, x11, sdl
 
 #bpp=0			# Force changing display depth.
 			# Valid settings are: 0, 15, 16, 24, 32
-			# NEEDS 'vm=yes' TOO ! (?)
+			# may need 'vm=yes' too.
 			# Used by drivers: fbdev, dga2, svga
 
 zoom=no			# Enable software scaling (powerful CPU needed)
-			# Used by drivers: svga, (sdl - why not?)
+			# Used by drivers: svga
 
-# x=800			# scale movie to <x> width 
-# y=600			# scale movie to <y> height
+# x=800			# scale movie to <x> pixels width
+# y=600			# scale movie to <y> pixles height
 
 ##
 ## Multiple languages are available :)
@@ -57,6 +57,14 @@ master	= no		# no : set PCM volume  	yes : set MASTER volume
 
 alsa = nem
 
+##
+## resample the fonts' alphamap
+## 0	plain white fonts
+## 0.75	very narrow black outline (default)
+## 1	narrow black outline
+## 10	bold black outline
+##
+
 ffactor = 0.75
 
 ##
@@ -80,6 +88,7 @@ ffactor = 0.75
 
 ##
 ## Specify DVD device (you need to install libcss, then recompile mplayer!)
+## (uncomment it _only_ if you _really_ have a DVD drive!)
 ##
 
 # dvd = /dev/dvd
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index da515cb042..bae057b963 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -1,8 +1,7 @@
 .\" MPlayer (C) 2000-2001 Arpad Gereoffy <arpi@esp-team.scene.hu>
 .\" This manpage was/is done by Gabucino
-.\" Manpage v1.1
 .\"
-.TH MPlayer 0.11
+.TH MPlayer-0.12 IdegCounter
 .SH NAME
 mplayer \- Movie Player for Linux
 .SH SYNOPSIS