# HG changeset patch
# User gabucino
# Date 989482910 0
# Node ID cc99cea3c7bd80c973a5e34a57f1c165efab8628
# Parent  cd1f0d4de0b8e4b220f2a08a2d1ab9f6417adbee
*** empty log message ***

diff -r cd1f0d4de0b8 -r cc99cea3c7bd DOCS/README
--- a/DOCS/README	Thu May 10 03:39:54 2001 +0000
+++ b/DOCS/README	Thu May 10 08:21:50 2001 +0000
@@ -161,7 +161,7 @@
     mplayer -vcd 2 /dev/cdrom
     mplayer -afm 3 /mnt/DVDtrailers/alien4.vob
     mplayer -dvd /dev/dvd /mnt/dvd/matrix.vob
-    mplayer -alsa -abs 65536 -delay -0.4 -nobps ~/movies/test.avi
+    mplayer -abs 65536 -delay -0.4 -nobps ~/movies/test.avi
 
   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
diff -r cd1f0d4de0b8 -r cc99cea3c7bd DOCS/codecs.conf
--- a/DOCS/codecs.conf	Thu May 10 03:39:54 2001 +0000
+++ b/DOCS/codecs.conf	Thu May 10 08:21:50 2001 +0000
@@ -30,7 +30,6 @@
   info "DivX ;-) (MS MPEG-4 v3)"
   comment "with postprocessing"
   status working
-;  fourcc DIV2 div4
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
diff -r cd1f0d4de0b8 -r cc99cea3c7bd DOCS/example.conf
--- a/DOCS/example.conf	Thu May 10 03:39:54 2001 +0000
+++ b/DOCS/example.conf	Thu May 10 08:21:50 2001 +0000
@@ -46,18 +46,6 @@
 master	= no		# no : set PCM volume  	yes : set MASTER volume
 
 ##
-## Remember the -noalsa switch ? You can specify it either with:
-##
-## noalsa = 1
-## or
-## alsa = no
-## or
-## noalsa = no
-##
-
-alsa = nem
-
-##
 ## resample the fonts' alphamap
 ## 0	plain white fonts
 ## 0.75	very narrow black outline (default)
diff -r cd1f0d4de0b8 -r cc99cea3c7bd DOCS/mplayer.1
--- a/DOCS/mplayer.1	Thu May 10 03:39:54 2001 +0000
+++ b/DOCS/mplayer.1	Thu May 10 08:21:50 2001 +0000
@@ -13,7 +13,6 @@
 .RB [ \-abs\ seconds ]
 .RB [ \-delay\ secs ]
 .RB [ \-bps\ value ]
-.RB [ \-noalsa\ ]
 .RB [ \-aid\ id ]
 .RB [ \-vid\ id ]
 .RB [ \-fps\ rate ]
@@ -159,9 +158,6 @@
 .B \-bps
 use avg. byte/sec value for A-V sync (AVI)
 .TP
-.B \-noalsa
-disable timing code
-.TP
 .B \-aid\ id
 select audio channel [MPG: 0-31  AVI: 1-99]
 .TP