From 3c79d6eeca5484b649d1b5a1d8838457e11cad57 Mon Sep 17 00:00:00 2001
From: attila
Date: Fri, 18 Oct 2002 17:57:05 +0000
Subject: [PATCH] doc fixes part 1 (more will come when i find the time to read
the rest) if anything is not ok, please let me know
documentation.html:
* OGG -> OGG/OGM (both file formats are supported)
* somewhat better wording (no real change of meaning)
* update of the current xf86 version from 4.2.0 to 4.2.1
* mga_vid is not old
* partial sync of the options with the manpage (someone with deeper knwoledge
should check them and finish the sync)
* added 2 links about quoting and correct writing of mails to the mailinglists
formats.html:
* fixing typo interleaved -> non-interleaved (at least i think it's a typo
please someone check it)
* non-interleaved AVIs should be played with -ni
* OGG -> OGG/OGM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7788 b3059339-0415-0410-9bf9-f77b7e298cf2
---
DOCS/documentation.html | 24 +++++++++++++++++-------
DOCS/formats.html | 13 +++++++------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 8891c62d99..d18acfe056 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -60,7 +60,7 @@
2.1.1.9 yuv4mpeg files
2.1.1.10 FILM files
2.1.1.11 RoQ files
- 2.1.1.12 OGG files
+ 2.1.1.12 OGG/OGM files
2.1.2 Audio formats
@@ -318,8 +318,8 @@
the avifile
library at all!). Another big feature of MPlayer is the wide range of
supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
- AAlib, DirectFB, but you can use GGI and SDL (and this way all their drivers)
- and some lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon,
+ AAlib, DirectFB, but you can also use GGI and SDL (and this way all their
+ drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and Radeon,
Mach64, Permedia3) too! Most
of them supports software or hardware scaling, so you can enjoy movies in
fullscreen. MPlayer supports displaying through some hardware MPEG
@@ -417,7 +417,7 @@
still NOT fixed, they have been WORKED AROUND in MPlayer!), see the
gcc 2.96 section and the
FAQ.
- XFree86 - suggested version is always the newest (4.2.0).
+ XFree86 - suggested version is always the newest (4.2.1).
Normally, everyone wants this, as starting with XFree86 4.0.2, it contains
the XVideo extension (somewhere referred to
as Xv) which is needed to enable the hardware YUV acceleration (fast
@@ -525,7 +525,7 @@
- Matrox G200/G400/G450/G550 cards: although a
Vidix driver is provided, it is recommended
- to use the old mga_vid kernel module instead, for it works much better.
+ to use the mga_vid kernel module instead, for it works much better.
Please see the mga_vid section about its
installation and usage. It is important to do these steps before
compiling MPlayer, otherwise no mga_vid support will be built. Also
@@ -1091,14 +1091,18 @@ TV tuner.
| q or ESC | | stop playing and quit program |
| + or - | | adjust audio delay by +/- 0.1 second |
| / or * | | decrease/increase volume |
+ | 9 or 0 | | decrease/increase volume |
+ | m | | mute sound |
| f | | toggle fullscreen |
+ | w or e | | decrease/increase panscan range |
| o | | toggle OSD: none / seek / seek+timer |
+ | d | | toggle frame dropping |
| v | | toggle subtitle visibility |
| z or x | | adjust subtitle delay by +/- 0.1 second |
| r or t | | adjust subtitle position |
| HOME or END | | go to next/previous playtree entry in the parent list |
| INSERT or DELETE | | go to next/previous alternative source (only available in asx playlist) |
- (the following keys are valid only when using -vo xv ) |
+ (the following keys are valid only when using -vo xv or -vo [vesa|fbdev]:vidix or -vo xvidix -vo (x)mga or -vc divxds (slow).) |
| 1 or 2 | | adjust contrast |
| 3 or 4 | | adjust brightness |
| 5 or 6 | | adjust hue |
@@ -1570,7 +1574,13 @@ end
stated otherwise the language of these lists is English. Please do
not send messages in other languages or HTML mail! Message size limit is 80k.
If you have something bigger put it up for download somewhere. Click the
- links to subscribe.
+ links to subscribe. On the mailing lists, the same rules about writing
+ and quoting aply as on usenet. Please follow them, it makes the life of
+ those who read your mails a lot easier. If you dont know them please
+ read HOWTO edit messages or
+ (if you are in a hurry)
+
+ Quoting HOWTO.
MPlayer supports two kinds of timings for AVI files:
@@ -207,7 +208,7 @@
Return to Castle Wolfenstein.
-
+
This is a new file format from Xiphophorus.
It can contain any video or audio codec, CBR or VBR. You will need to