# HG changeset patch
# User diego
# Date 1029327841 0
# Node ID 83a386e88f9e89bdc30c2f5c406c49ee7aed983a
# Parent 85fc65e6667fdd2025a33c016ed8ba10d07dd15d
Applied patch by Andras Mohari
* Reduces the number of '!' chars...
* Removes unnecessary spaces before ':' and '!' chars.
* Changes the title of Appendix X to 'MPlayer skin format'.
* Improves(?) wording in some cases.
* Adds CODE tags around some options and filenames.
Plus some further wording fixes by me, two dangling links and converted
a few ASCII unordered lists into proper HTML ones.
diff -r 85fc65e6667f -r 83a386e88f9e DOCS/codecs.html
--- a/DOCS/codecs.html Wed Aug 14 12:20:35 2002 +0000
+++ b/DOCS/codecs.html Wed Aug 14 12:24:01 2002 +0000
@@ -16,7 +16,7 @@
2.2.1 Video codecs
See the codec status table
- for the complete, daily generated list!!!
+ for the complete, daily generated list.
The most important ones above all:
@@ -39,7 +39,7 @@
If you have a Win32 codec not listed here which is not supported yet, please
read the codec importing HOWTO and help us add support
- for it!
+ for it.
2.2.1.1 DivX4/DivX5
@@ -77,7 +77,7 @@
| -vc odivx | |
Uses the codec in OpenDivX fashion. In this case it
produces YV12 images in its own buffer, and MPlayer does colorspace
- conversion via libvo. (FAST, RECOMMENDED!) |
+ conversion via libvo. (Fast, recommended!)
| -vc divx4 | |
Uses the colorspace conversion of the codec.
In this mode you can use YUY2/UYVY, too. (SLOW) |
@@ -117,12 +117,12 @@
- Move the
libavcodec
directory from the FFmpeg sources to the
root of the MPlayer CVS tree. It should look like this:
main/libavcodec
- Symlinking is not enough, you have to copy/move it!!!
+ Symlinking is not enough, you have to copy or move it!
- Compile. Configure should detect problems before compilation.
Note: MPlayer from CVS does contain a libavcodec
- subdirectory, but it does NOT contain the source for libavcodec!
+ subdirectory, but it does not contain the source for libavcodec!
You must follow the steps above to obtain the source for this library.
With FFmpeg and my Matrox G400, I can view even the highest resolution DivX
@@ -217,7 +217,7 @@
--with-reallibdir
switch.
Note: RealPlayer libraries currently only work with Linux, FreeBSD,
- NetBSD and Cygwin on the x86 platform!
+ NetBSD and Cygwin on the x86 platform.
Note2: We cannot distribute the RealPlayer libraries, the license does
not allow this. You have to get them yourself.
@@ -336,7 +336,7 @@
driver must properly support the AFMT_AC3 format (C-Media does). Connect
your AC3 decoder to the SP/DIF output, and use the -ac hwac3
option. It is experimental but known to work with C-Media cards and
- Soundblaster Live! + ALSA (but not OSS) drivers.
+ Soundblaster Live! using ALSA (but not OSS) drivers.
2.2.2.3 libmad support
diff -r 85fc65e6667f -r 83a386e88f9e DOCS/documentation.html
--- a/DOCS/documentation.html Wed Aug 14 12:20:35 2002 +0000
+++ b/DOCS/documentation.html Wed Aug 14 12:24:01 2002 +0000
@@ -286,7 +286,7 @@
Appendix D - Known bugs
- Appendix X - How to become a famous skin maker in 5 minutes!
+ Appendix X - MPlayer skin format
@@ -341,7 +341,7 @@
Win32 DLL codecs. You can watch VideoCD, SVCD, DVD,
3ivx, RealMedia, and DivX movies too (and you don't need
the avifile
- library at all!). The another big feature of mplayer is the wide range of
+ 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,
@@ -349,8 +349,8 @@
of them supports software or hardware scaling, so you can enjoy movies in
fullscreen. MPlayer supports displaying through some hardware MPEG
decoder boards, such as the DVB and
- DXR3/Hollywood+! And what about the nice big antialiased
- shaded subtitles (10 supported types!!!) with european/ISO 8859-1,2
+ DXR3/Hollywood+. And what about the nice big antialiased
+ shaded subtitles (10 supported types) with European/ISO 8859-1,2
(Hungarian, English, Czech, etc), Cyrillic, Korean fonts, and the onscreen
display (OSD)?
@@ -431,7 +431,7 @@
binutils - suggested version is 2.11.x . This program is
responsible for generating MMX/3DNow!/etc instructions, thus very important.
gcc - suggested versions are: 2.95.3, 2.95.4 and 3.1.
- NEVER use 2.96 or 3.0.x !!! They generate faulty code for MPlayer.
+ NEVER use 2.96 or 3.0.x! They generate faulty code for MPlayer.
If you decide to change gcc from 2.96, then don't decide in favor of 3.0.x
just because it's newer! Early releases of 3.0.x were even more buggy than
2.96. So downgrade to 2.95.x (downgrade libstdc++ too, other programs may
@@ -483,9 +483,9 @@
architecture, you will possibly need them. Download and unzip w32codecs.zip
to /usr/lib/win32 BEFORE compiling MPlayer, otherwise no Win32
support will be compiled!
- Note: the avifile project has similar codecs package, but it differs
- from ours, so if you want to use all supported codecs, then use our package!
- However, you can use our codecs package with avifile. Features:
+ Note: the avifile project has a similar codecs package, but it differs
+ from ours. If you want to use all supported codecs, then install our package
+ (do not worry, avifile works with it without problems). Features:
- you need this if you want to play or encode for example movies recorded
with various hardware compressors, like tuner cards, digital cameras
@@ -532,7 +532,7 @@
- MPlayer can use the libraries of RealPlayer 8 or RealONE to play
files with RealVideo 2.0 and 3.0 video, and Sipro/Cook audio. See
RealMedia file format section for
- installation instructions and more information!
+ installation instructions and more information.
VIDEO CARDS
@@ -543,8 +543,8 @@
YUV cards
They can display and scale (zoom) the picture to any size that fits in
- their memory, with small CPU usage (zooming doesn't increase it!), thus
- you get a nice and very fast fullscreen playing.
+ their memory, with small CPU usage (even when zooming), thus
+ fullscreen playing is nice and very fast.
- Matrox G200/G400/G450/G550 cards: although a
@@ -554,15 +554,15 @@
installation and usage. It is important to do these steps before
compiling MPlayer, otherwise no mga_vid support will be built. Also
check out the Matrox TV-out section.
- If you are non-Linux user, your only possibility is the Vidix
- driver: read VIDIX documentation!
+ If you don't use Linux, your only possibility is the VIDIX
+ driver: read the VIDIX section.
- 3Dfx Voodoo3/Banshee cards: please see the
tdfxfb section in order to gain big
speedup. It is important to do these steps before compiling
MPlayer, otherwise no 3Dfx support will be built. Also see the 3dfx TV-out section. If you use X, use at
least 4.2.0, as 3dfx Xv driver was broken in 4.1.0, and earlier
- releases!
+ releases.
- ATI cards: Vidix driver is
provided for the following cards:
Radeon, Rage128, Mach64 (Rage XL/Mobility, Xpert98).
@@ -574,45 +574,45 @@
have problems with YV12 display, see S3 Xv
section for details. Older, Trio cards have no, or slow hardware
support.
- - nVidia cards: very bad choice for video playing (nVidia has
- different opinion!).
- nVidia's cards have very cheap and bad quality chips. Moreover, the
- built-in nVidia driver in XFree86 doesn't contain support for hardware YUV
- acceleration for all nVidia cards! You have to download nVidia's
- closed-source drivers from nVidia.com. See details in nVidia Xv driver section.
+ - nVidia cards: very bad choice for video playing (nVidia
+ does not think so).
+ nVidia's cards have very cheap and bad quality chips. Moreover, the
+ built-in nVidia driver in XFree86 does not support hardware YUV
+ acceleration on all nVidia cards. You have to download nVidia's
+ closed-source drivers from nVidia.com. See the nVidia Xv driver section for details.
- 3DLabs GLINT R3 and Permedia3: a VIDIX driver is provided
- (pm3_vid). Please see the VIDIX
- instructions.
- - other cards: none of the above?
+ (pm3_vid). Please see the VIDIX section for
+ details.
+ - Other cards: None of the above?
- Try if the XFree86 driver (and your card) supports hardware
acceleration. See the Xv section for
details.
- If it doesn't, then your card's video features aren't supported under
- your OS :(
- If it does hardware scaling under Windows, it doesn't mean it will do the
- same under Linux or other OS, it depends on the drivers! Most
- manufacturers don't make Linux drivers nor release chip specs - so you're
- unlucky using their cards. See the next section:
+ your operating system :(
+ If hardware scaling works under Windows, it doesn't mean it will work
+ under Linux or other operating systems: it depends on the drivers. Most
+ manufacturers neither make Linux drivers nor release specifications
+ for their chips, so you are unlucky using their cards.
+ See 'Non-YUV cards'.
Non-YUV cards
-Fullscreen playing can be achieved by either zooming by software (use
- the option -zoom
or -vop
- scale
, but I warn you: this is SLOW!), or changing to a smaller
- video mode, for example to 352x288. If you don't have YUV acceleration, this
- latter method is the recommended one. Throughout MPlayer, this
- behavior can be switched on by using the -vm
option and with
- the following drivers:
+Fullscreen playing can be achieved by either enabling software scaling
+ (use the -zoom
or -vop scale
+ option, but I warn you: this is slow), or switching to a small resolution
+ video mode, for example 352x288. If you don't have YUV acceleration, the
+ latter method is recommended. Video mode switching can be enabled by
+ using the -vm
option and it works with the following drivers:
- - using XFree86: see details in
+
- using XFree86: see the
DGA driver and
- X11 driver sections. DGA is
+ X11 driver sections for details. DGA is
recommended! Also try DGA via SDL, sometimes it's better.
- not using XFree86: try the drivers in the following order:
vesa,
@@ -655,11 +655,11 @@
- Soundblaster Live!: with this card you can use 4 or 6 (5.1)
channels AC3 decoding instead of 2. Read the
Software AC3 decoding section.
- For hardware AC3 passthrough you MUST use ALSA 0.9 oss emulation!
+ For hardware AC3 passthrough you must use ALSA 0.9 with OSS emulation!
- C-Media with SP/DIF out: hardware AC3 passthrough is possible
with these cards, see
Hardware AC3 decoding section.
- - other cards' features aren't supported by MPlayer.
+
- Features of other cards aren't supported by MPlayer.
It's very recommended to read the sound card
section!
@@ -687,16 +687,17 @@
At this point, MPlayer is ready to use. The directory
$PREFIX/share/mplayer
contains the codecs.conf
file, which is used to tell the program all the codecs and their
- capabilities. This file should always be kept uptodate together with the
- main binary!
Check if you have codecs.conf in your home directory
- (~/.mplayer/codecs.conf) left from old MPlayer versions, and remove it!
-
-Debian users can build a .deb package for themselves, it's very
- simple. Just exec fakeroot debian/rules binary
in
- MPlayer's root dir. Detailed instructions can be found
+ capabilities. This file should always be kept up to date together with the
+ main binary.
+ Check if you have codecs.conf
in your home directory
+ (~/.mplayer/codecs.conf
) left from old MPlayer versions, and remove it.
+
+Debian users can build a .deb
package for themselves,
+ it's very simple. Just exec fakeroot debian/rules binary
in
+ MPlayer's root directory. Detailed instructions can be found
here.
-ALWAYS browse the output of ./configure
, and the
+
Always browse the output of ./configure
, and the
configure.log
file, they contain information about what will be
built, and what will not. You may also want to view config.h
and
config.mak
files.
@@ -731,8 +732,8 @@
and call gmplayer
instead.
-
HINT: use the middle button (on 2 button mice press left and right
- simultaneously) for a popup GTK menu, with DVD playing option!
+HINT: Press the middle button (on 2 button mice press left and right
+ simultaneously) to open a GTK menu with DVD playing option!
As MPlayer doesn't have a skin included, you have to download them if
you want to use the GUI. See the
@@ -1556,7 +1557,7 @@
3.2.3 Control from LIRC
Linux Infrared Remote Control - use an easy to build home-brewn IR-receiver,
- an (almost) arbitrary remote control and control your linux box with it!
+ an (almost) arbitrary remote control and control your Linux box with it!
More about it at www.lirc.org.
If you have installed the lirc-package, configure will autodetect it. If
@@ -1758,19 +1759,19 @@
For DVD support you must have the patched libcss installed. Patch:
http://www.tools.de/solaris/mplayer/.
-Due to two bugs in Solaris 8 x86, you cannot reliably play DVDs using a
- capacity >4GB:
+Due to two bugs in Solaris 8 x86, you cannot reliably play DVD discs larger
+ than 4 GB:
- The sd(7D) driver on Solaris 8 x86 driver has bug when accessing a disk
block >4GB on a device using a logical blocksize != DEV_BSIZE (i.e. CD-ROM
- and DVD media). Due to a 32bit int overflow, a disk address modulo 4GB is
+ and DVD media). Due to a 32Bit int overflow, a disk address modulo 4GB is
accessed.
(http://groups.yahoo.com/group/solarisonintel/message/22516)
- - The similar bug is present in the hsfs(7FS) filesystem code (aka
- ISO9660), hsfs currently does not support partitions/disks >4GB, all data
- is accessed modulo 4GB
+
- A similar bug is present in the hsfs(7FS) filesystem code (aka
+ ISO9660), hsfs currently does not support partitions/disks larger than 4GB, all data
+ is accessed modulo 4GB.
(http://groups.yahoo.com/group/solarisonintel/message/22592)
@@ -1843,7 +1844,8 @@
Appendix A - Authors
-NOTE: Do *NOT* send bug reports, help & feature requests directly to the authors!
+NOTE: Do not send bug reports, help & feature requests directly to
+ the authors!
Read Appendix C and subscribe to mplayer-users mailing lists.
@@ -2503,8 +2505,8 @@
reads this list!
-Note: The Languages of above lists are ENGLISH, unless explicitly
- stated otherwise. Please do not send messages using another language!
+Note: Unless explicitly stated otherwise the language of the above
+ lists is English. Please do not send messages in other languages!
Note: You can reach the searchable mailing list archives
here.
diff -r 85fc65e6667f -r 83a386e88f9e DOCS/encoding.html
--- a/DOCS/encoding.html Wed Aug 14 12:20:35 2002 +0000
+++ b/DOCS/encoding.html Wed Aug 14 12:24:01 2002 +0000
@@ -211,8 +211,8 @@
- Video stream (option
-ovc copy
): nice stuff can be
done :)
- Like, putting (not converting!) FLI or VIVO or MPEG1 video into
- an AVI file! Of course only MPlayer can play such files :) And it
+ Like, putting (not converting) FLI or VIVO or MPEG1 video into
+ an AVI file. Of course only MPlayer can play such files :) And it
probably has no real life value at all. Rationally: video stream copying
can be useful for example when only the audio stream has to be encoded
(like, uncompressed PCM to MP3).
@@ -350,10 +350,10 @@
2.4.5 Available options
-NOTE: for all available options, read the man page!
+NOTE: for all available options, read the man page.
As MEncoder is built on the same codebase as MPlayer, there
- are many MPlayer options that have function in MEncoder too!
+ are many MPlayer options that have function in MEncoder too.
See, you can use -sid
to rip a DVD with subtitles, or
-noidx
to disregard buggy index of input AVI. Be smart!
@@ -365,7 +365,7 @@
-endpos time |
- stop encoding at the given time. See the man page for examples!
+ | stop encoding at the given time. See the man page for examples.
|
@@ -417,7 +417,7 @@
-divx4opts |
If encoding to DivX4, you can specify its parameters here, like:
-divx4opts br=1800:deinterlace:key=250
- Common options: (for full list, check the man page!)
+ Common options: (for a full list, check the man page)
help - get help
br=<value> - specify bitrate in kbit <4-16000>
or bit <16001-24000000>
@@ -429,7 +429,7 @@
| -lavcopts |
If encoding with libavcodec, you can specify its parameters here, like:
-lavcopts vcodec=msmpeg4:vbitrate=1800:vhq:keyint=250
- Common options: (for full list, check the man page!)
+ Common options: (for a full list, check the man page)
help - get help
vcodec=<value> - select videocodec (for the full list, see the libavcodec section above)
vbitrate=<value> - specify bitrate in kbit <4-16000> or bit <16001-24000000>
@@ -442,7 +442,7 @@
| If encoding to MP3 with libmp3lame, you can specify its parameters here, like:
-lameopts q=3
-lameopts br=192:cbr
- Common options: (for full list, check the man page!)
+ Common options: (for a full list, check the man page)
help - get help
cbr - select CBR MP3 (default is VBR)
br=<value> - specify bitrate in kbit <0-1024> (this is for CBR only!)
@@ -488,10 +488,10 @@
Encoding multiple *.vob files:
cat *.vob | mencoder <options> -
-Encoding from tuner (for tuner options see the TV input section!):
+ Encoding from tuner (see the TV input section for tuner options):
mencoder -tv on:driver=v4l:width=640:height=480 <options>
-For all available options, check the MEncoder man page!
+For all available options, check the MEncoder man page.
|