qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+

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

6 files changed, 16 insertions, 35 deletions

diff --git a/DOCS/CODECS b/DOCS/CODECS
index 4b98024556..57d63d6e51 100644
--- a/DOCS/CODECS
+++ b/DOCS/CODECS
@@ -80,7 +80,7 @@ Audio codecs:
 ~~~~~~~~~~~~~
 Built-in native codecs:
 
-- Uncompressed PCM (0x1)
+- Uncompressed PCM (0)
 - Uncompressed DVD PCM: (0x10001)
 - MPEG layer 2 and 3:  (0x50, 0x55)
   mp3lib, based on mpg123  (sometimes segfaults, then use ACM, see below)
diff --git a/DOCS/LIRC b/DOCS/LIRC
index 3fa0c42e33..831ede3c66 100644
--- a/DOCS/LIRC
+++ b/DOCS/LIRC
@@ -29,10 +29,6 @@ o MPlayer and LIRC
  FRWND  - 60 secs back
  FWD    - skip 10 secs
  FFWD   - skip 60 secs
- INCVOL - increase volume one percent
- DECVOL - decrease volmue one percent
- MASTER - use master mixer channel
- PCM    - use pcm mixer channel
 
  Don't forget to enable the repeat flag for RWND/FWD in .lircrc. Here's an
  excerpt from my .lircrc:
diff --git a/DOCS/SOUNDCARDS b/DOCS/SOUNDCARDS
index 5ae42ea32e..0cbde947b0 100644
--- a/DOCS/SOUNDCARDS
+++ b/DOCS/SOUNDCARDS
@@ -2,11 +2,12 @@
 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: (Pontscho)
+			In config.h, change #define HAVE_AUDIO_SELECT to
+			  #undef HAVE_AUDIO_SELECT
+			OSS	: With MPEG files : defaults are ok
+				  With AVI files  : -delay -0.5
+			ALSA	: same
 
 SB Live!:
 			OSS	: OK
diff --git a/DOCS/VIDEOCARDS b/DOCS/VIDEOCARDS
index 3d81a94195..b9f2613379 100644
--- a/DOCS/VIDEOCARDS
+++ b/DOCS/VIDEOCARDS
@@ -157,7 +157,7 @@ b, You want to use framebuffer...
   read the framebuffer documentation in the kernel sources
   (Documentation/fb/*) !
 
-  ... but your card doesn't support VBE 2.0 standard (older ISA/PCI
+  ... but don't your card doesn't support VBE 2.0 standard (older ISA/PCI
   cards, such as S3 Trio64) :
   Well, VESAfb is still available, but you'll have to load SciTech Display
   Doctor (formerly UniVBE) before booting Linux.  Use a DOS boot disk or
diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index d5cba433ca..7d831b3c48 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -146,12 +146,11 @@ videocodec wmv1
   out BGR32,BGR24,BGR16,BGR15
 
 videocodec ap41
-  info "AngelPotion Definitive V1 (really (MS MPEG-4 v3))"	; yet another stolen stuff
+  info "AngelPotion Definitive V1"	; yet another stolen stuff
   status working
   fourcc AP41 div3  
   driver dshow
-  dll "divx_c32.ax"		; no need to use apmpg4v1.dll, it's only a
-				; fuckin' wrapper..
+  dll "divx_c32.ax"		; no need to use apmpg4v1.dll
   guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 4f9644b828..969fe911a6 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -28,11 +28,6 @@ mplayer \- Movie Player for Linux
 .RB [ \-pp\ quality ]
 .RB [ \-include\ configfile ]
 .RB [ \-ffactor\ number ]
-.RB [ \-sub\ file ]
-.RB [ \-subfps\ rate ]
-.RB [ \-vm\ ]
-.RB [ \-zoom\ ]
-
 .I file
 .PP
 .SH DESCRIPTION
@@ -65,15 +60,12 @@ play video cd track from device instead of plain file
 don't play sound
 .TP
 .B \-fs
-fullscreen playing (with xv, xmga, gl, sdl, x11,
-fbdev drivers)
-.TP
-.B \-vm
-use the XF86VidMode extension (with x11, sdl, and dga1
-drivers, dga2 doesn't need this)
-.TP
-.B \-zoom
-use software scaling
+fullscreen playing (only gl, xmga and xv drivers)
+
+.I NOTE
+The X11 driver doesn't support fullscreen and scaling.
+However, you can do it yourself, just press ALT,CTRL,-
+or ALT,CTRL,+ simultaneously, see X-server docs for details.
 .TP
 .B \-x\ x
 scale image to x width [if driver suppports!]
@@ -155,13 +147,6 @@ force usage of non-interleaved AVI parser
 .TP
 .B \-include
 specify config file to be parsed after the default
-.TP
-.B \-sub
-specify subtitle file to display
-.TP
-.B \-subfps
-specify frame/sec rate of the subtitle file, in
-case it was autodetected wrong
 .IP
 .SH "ALPHA/BETA CODE"
 .TP