diff options
| author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-10 08:21:50 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-10 08:21:50 +0000 |
| commit | 46b1cf318d426013c93f4ba0b50280208e5a126d (patch) | |
| tree | 5ef85bff8fcd64b61d66b16e0b55d64aa1cdbc63 | |
| parent | dda6708094e31b4bee948a48d4beaf2b2556d8f9 (diff) | |
| download | mpv-46b1cf318d426013c93f4ba0b50280208e5a126d.tar.bz2 mpv-46b1cf318d426013c93f4ba0b50280208e5a126d.tar.xz | |
*** empty log message ***
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@748 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/README | 2 | ||||
| -rw-r--r-- | DOCS/codecs.conf | 1 | ||||
| -rw-r--r-- | DOCS/example.conf | 12 | ||||
| -rw-r--r-- | DOCS/mplayer.1 | 4 |
4 files changed, 1 insertions, 18 deletions
diff --git a/DOCS/README b/DOCS/README index 0b23d4a694..32078577bc 100644 --- a/DOCS/README +++ b/DOCS/README @@ -161,7 +161,7 @@ Usage: 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 --git a/DOCS/codecs.conf b/DOCS/codecs.conf index ed68f87b49..a58e3b1fed 100644 --- a/DOCS/codecs.conf +++ b/DOCS/codecs.conf @@ -30,7 +30,6 @@ videocodec divxds 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 --git a/DOCS/example.conf b/DOCS/example.conf index 135fc796b8..3219217462 100644 --- a/DOCS/example.conf +++ b/DOCS/example.conf @@ -46,18 +46,6 @@ mixer = /dev/mixer 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 --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index adf160281c..bd13c0d152 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -13,7 +13,6 @@ mplayer \- Movie Player for Linux .RB [ \-abs\ seconds ] .RB [ \-delay\ secs ] .RB [ \-bps\ value ] -.RB [ \-noalsa\ ] .RB [ \-aid\ id ] .RB [ \-vid\ id ] .RB [ \-fps\ rate ] @@ -159,9 +158,6 @@ audio delay in seconds (may be +/- float value) .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 |