# HG changeset patch
# User diego
# Date 1136503938 0
# Node ID 7f9fcf5245a04914993889a0d0e29c1d3919318b
# Parent 80c9127688be06ca9339157ea20a2fb612e87f33
Improve overall structure by adding a few top-level chapters so that
sections no longer nest as deeply. This has the added benefit of
removing a few sections that only consisted of the section title.
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/audio.xml
--- a/DOCS/xml/en/audio.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/audio.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,8 +1,8 @@
-
+Audio output devices
-
+Audio/Video synchronization
@@ -33,9 +33,9 @@
option, it should sort out your problems. See the man page for detailed
information.
-
+
-
+TroubleshootingSome notes:
@@ -53,6 +53,6 @@
If the sound clicks when playing from CD-ROM, turn on IRQ unmasking as
described in the CD-ROM section.
-
+
-
+
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/codecs.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,9 +1,9 @@
-
-Supported codecs
+
+Codecs
-
+Video codecs
@@ -76,7 +76,7 @@
-
+DivX4/DivX5
@@ -188,10 +188,10 @@
-
+
-
+FFmpeg/libavcodec
@@ -276,10 +276,10 @@
With FFmpeg and my Matrox G400, I can view even the highest resolution DivX
movies without dropped frames on my K6-2 500.
-
+
-
+XAnim codecs
@@ -339,10 +339,10 @@
Tested codecs include: Indeo 3.2, 4.1, 5.0, CVID, 3ivX,
H.263.
-
+
-
+VIVO videoMPlayer can play Vivo (1.0 and 2.0) videos. The
@@ -352,10 +352,10 @@
command line options MPlayer selects the best codec
automatically.
-
+
-
+MPEG-1/2 video
MPEG-1 and MPEG-2 are decoded by the multiplatform native
-
+
-
+MS Video1, Cinepak CVID, and other older codecsMPlayer is able to play most of the older codecs
@@ -378,10 +378,10 @@
native codecs for most of them using
libavcodec.
-
+
-
+RealVideo
@@ -414,10 +414,10 @@
only work with Linux, FreeBSD, NetBSD and Cygwin on the x86,
Alpha and PowerPC (Linux/Alpha and Linux/PowerPC have been tested) platforms and with Mac OS X.
-
+
-
+XviD
@@ -478,10 +478,10 @@
-
+
-
+Sorenson
@@ -517,12 +517,12 @@
compile MPlayer
-
+
-
+x264
-
+What is x264?x264 is a library for
@@ -557,9 +557,9 @@
Parallel encoding of multiple slices
-
+
-
+What is H.264?
H.264 is one name for a new digital video codec jointly developed
@@ -597,9 +597,9 @@
but if you are interested in a brief overview, you may want to read
The H.264/AVC Advanced Video Coding Standard: Overview and Introduction to the Fidelity Range Extensions.
-
+
-
+How can I play H.264 videos with MPlayer?MPlayer uses
@@ -619,9 +619,9 @@
H.264 decoding, you might keep an eye on
FFmpeg CVS repository's web interface.
-
+
-
+How can I encode videos using MEncoder and x264?
If you have the subversion client installed, the latest x264
@@ -657,13 +657,13 @@
The configure script will autodetect that you have satisfied the
requirements for x264.
-
+
-
+Audio codecs
@@ -711,7 +711,7 @@
-
+Software AC3 decoding
@@ -747,10 +747,10 @@
(used by Soundblaster Live! cards) from August 2001 or newer (ALSA CVS is
also supposed to work).
-
+
-
+Hardware AC3 decoding
You need an AC3 capable sound card, with digital out (S/PDIF). The card's
@@ -760,10 +760,10 @@
cards and Soundblaster Live! + ALSA (but not OSS) drivers and DXR3/Hollywood+
MPEG decoder cards.
-
+
-
+libmad support
@@ -778,10 +778,10 @@
To enable support, compile with the configure
option.
-
+
-
+VIVO audio
The audio codec used in VIVO files depends on whether it is a VIVO/1.0 or
@@ -789,10 +789,10 @@
and VIVO/2.0 files have Vivo Siren audio. Both are
supported.
-
+
-
+RealAudio
@@ -815,9 +815,9 @@
Instructions on how to install the RealPlayer libraries are in the
RealVideo section.
-
+
-
+QDesign codecs
QDesign audio streams (fourcc:QDMC, QDM2) are found
@@ -825,9 +825,9 @@
libraries. For installation instructions please see the
Sorenson video codec section.
-
+
-
+Qualcomm codecs
Qualcomm audio streams (fourcc:Qclp) is found
@@ -835,9 +835,9 @@
libraries. For installation instructions please see the
Sorenson video codec section.
-
+
-
+AAC codec
AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4
@@ -867,18 +867,18 @@
Mandrake/Mandriva RPMs from the P.L.F and RedHat RPMs
from Grey Sector.
-
+
-
+
-
+Win32 codecs importing HOWTO
-
+VFW codecs
@@ -917,10 +917,10 @@
e.g. search for "VIDC.HFYU". To find out how to do this, look at
the old DirectShow method below.
-
+
-
+DirectShow codecs
@@ -1030,6 +1030,7 @@
DOCS/tech/codecs.conf.txt.
-
+
+
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/documentation.xml
--- a/DOCS/xml/en/documentation.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/documentation.xml Thu Jan 05 23:32:18 2006 +0000
@@ -172,14 +172,20 @@
&history.xml;
-&install.xml;
+&install.xml;
-&features.xml;
&usage.xml;
+&cd-dvd.xml;
&faq.xml;
-&cd-dvd.xml;
+
+&formats.xml;
+&codecs.xml;
+&video.xml;
+&audio.xml;
+&tvinput.xml;
+
&ports.xml;
&mencoder.xml;
&encoding-guide.xml;
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/features.xml
--- a/DOCS/xml/en/features.xml Thu Jan 05 22:50:54 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-
-
-
-Features
-
-&formats.xml;
-&codecs.xml;
-
-&video.xml;
-&audio.xml;
-
-&tvinput.xml;
-
-
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/formats.xml
--- a/DOCS/xml/en/formats.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/formats.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,7 +1,7 @@
-
-Supported formats
+
+Containers
It is important to clarify a common mistake. When people see a file with a
@@ -30,10 +30,10 @@
-
+Video formats
-
+MPEG files
@@ -85,10 +85,10 @@
rescaled during encoding or played with the
option.
-
+
-
+AVI files
@@ -167,10 +167,10 @@
There are only two known exceptions: NanDub and
MEncoder.
-
+
-
+ASF/WMV files
ASF (Active Streaming Format) comes from Microsoft. They developed two
@@ -182,10 +182,10 @@
v2.0 files :). Note that ASF files nowadays come with the extension
.WMA or .WMV.
-
+
-
+QuickTime/MOV files
@@ -204,10 +204,10 @@
QDesign Music audio. See our Sorenson codec section.
-
+
-
+VIVO files
@@ -231,10 +231,10 @@
VIVO audio codec
sections for installation instructions.
-
+
-
+FLI filesFLI is a very old file format used by
@@ -244,10 +244,10 @@
option). FLI files do not have keyframes, so the
picture will be messy for a short time after seeking.
-
+
-
+RealMedia (RM) files
@@ -257,10 +257,10 @@
linkend="realvideo">RealVideo and RealAudio codecs.
-
+
-
+NuppelVideo filesNuppelVideo
@@ -272,10 +272,10 @@
them with MEncoder to MPEG-4 (DivX)/etc!) them all.
Seeking works.
-
+
-
+yuv4mpeg filesyuv4mpeg / yuv4mpeg2
@@ -284,27 +284,27 @@
You can grab, produce, filter or encode video in this format using these tools.
The file format is really a sequence of uncompressed YUV 4:2:0 images.
-
+
-
+FILM files
This format is used on old Sega Saturn CD-ROM games.
-
+
-
+RoQ files
RoQ files are multimedia files used in some ID games such as Quake III and
Return to Castle Wolfenstein.
-
+
-
+OGG/OGM files
This is a new fileformat from Xiphophorus.
@@ -313,10 +313,10 @@
libvorbis installed before
compiling MPlayer to be able to play it.
-
+
-
+SDP filesSDP is an
@@ -324,19 +324,19 @@
(The "LIVE.COM Streaming Media"
are required.)
-
+
-
+PVA files
PVA is an MPEG-like format used by DVB TV boards' software (e.g.:
MultiDec, WinTV under Windows).
-
+
-
+NSV files
NSV (NullSoft Video) is the file format used by the
@@ -350,29 +350,29 @@
depacketization layer that still has to be implemented (those files are
unplayable anyway because they use VLB audio).
-
+
-
+Matroska files
Matroska is an open container format.
Read more on the official site.
-
+
-
+NUT files
NUT is the container format developed by MPlayer and
FFmpeg folks. Both projects support it.
Read more on the official site.
-
+
-
+GIF files
The GIF format is a common format for web
@@ -406,12 +406,12 @@
homepage. For detailed technical information, have a look at the
GIF89a specification.
-
+
-
+Audio formats
@@ -422,7 +422,7 @@
url="http://www.xmms.org">XMMS.
-
+MP3 files
You may have problems playing certain MP3 files that
@@ -432,35 +432,35 @@
foreseeable future. The flag described in the
man page may help you in these cases.
-
+
-
+WAV files
-
+
-
+OGG/OGM files (Vorbis)
Requires properly installed
libogg and
libvorbis.
-
+
-
+WMA/ASF files
-
+
-
+MP4 files
-
+
-
+CD audioMPlayer can use cdparanoia
@@ -472,9 +472,9 @@
See the man page's option which can be used to pass
options to cdparanoia.
-
+
-
+XMMSMPlayer can use XMMS input
@@ -491,6 +491,7 @@
plugin and library path explicitly by way of the
and options.
-
+
+
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/install.xml
--- a/DOCS/xml/en/install.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/install.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,6 +1,6 @@
-
+Installation
@@ -22,8 +22,7 @@
You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
-
-
+Software requirements
@@ -132,10 +131,10 @@
./configure where that file is.
-
+
-
+Codecs
@@ -258,10 +257,10 @@
section for installation instructions and more information.
-
+
-
+Video cards
@@ -271,7 +270,7 @@
-
+YUV cards
@@ -348,10 +347,10 @@
-
+
-
+Non-YUV cards
@@ -377,10 +376,10 @@
-
+
-
+Cirrus-Logic cards
@@ -410,11 +409,11 @@
-
+
-
+Sound cards
@@ -435,10 +434,10 @@
to read the sound card section!
-
+
-
+Features
@@ -521,7 +520,6 @@
See the Subtitles and OSD section for details.
-
@@ -957,3 +955,5 @@
+
+
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/tvinput.xml
--- a/DOCS/xml/en/tvinput.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/tvinput.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,5 +1,8 @@
+
+TV
+
TV input
@@ -211,3 +214,5 @@
+
+
diff -r 80c9127688be -r 7f9fcf5245a0 DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml Thu Jan 05 22:50:54 2006 +0000
+++ b/DOCS/xml/en/video.xml Thu Jan 05 23:32:18 2006 +0000
@@ -1,9 +1,9 @@
-
+Video output devices
-
+Setting up MTRR
@@ -83,11 +83,11 @@
stepping 0) CPUs don't have MTRRs, but stepping 12 does
(execute cat /proc/cpuinfo to check it).
-
+
-
+Video outputs for traditional video cards
-
+Xv
@@ -161,7 +161,7 @@
-
+3dfx cards
@@ -179,10 +179,10 @@
driver! See the tdfxfb
section.
-
+
-
+S3 cards
@@ -198,10 +198,10 @@
on the MPlayer-users mailing list for an MMX/3DNow! enabled driver.
-
+
-
+nVidia cards
@@ -224,10 +224,10 @@
is in beta stage, and has some drawbacks. For more information, see
nVidia VIDIX section.
-
+
-
+ATI cards
@@ -245,10 +245,10 @@
TV output, and no libraries or X are needed.
Read the VIDIX section.
-
+
-
+NeoMagic cards
@@ -277,10 +277,10 @@
EndSection
-
+
-
+Trident cards
If you want to use Xv with a Trident card, provided that it doesn't work
@@ -293,22 +293,22 @@
VIDIX driver for the Cyberblade/i1 card.
-
+
-
+Kyro/PowerVR cards
If you want to use Xv with a Kyro based card (for example Hercules
Prophet 4000XT), you should download the drivers from the
PowerVR site
-
+
-
+DGA
@@ -591,12 +591,12 @@
-
-
+
+
-
+SDL
@@ -684,10 +684,10 @@
DO NOT USE SDL with GUI! It won't work as it should.
-
+
-
+SVGAlib
@@ -760,10 +760,10 @@
You can turn on OSD and subtitles only with the
filter, see the man page for exact parameters.
-
+
-
+Framebuffer output (FBdev)
@@ -857,10 +857,10 @@
MPlayer limitation.
-
+
-
+Matrox framebuffer (mga_vid)
@@ -934,10 +934,10 @@
and can be written for brightness change:
echo "brightness=120" > /dev/mga_vid
-
+
-
+3Dfx YUV support
This driver uses the kernel's tdfx framebuffer driver to play movies with
@@ -945,10 +945,10 @@
with
./configure --enable-tdfxfb
-
+
-
+OpenGL output
@@ -983,10 +983,10 @@
export $__GL_SYNC_TO_VBLANK=1
-
+
-
+AAlib - text mode displaying
@@ -1112,10 +1112,10 @@
See for further
tuning issues.
-
+
-
+libcaca - Color ASCII Art library
@@ -1205,10 +1205,10 @@
enough to render all frames.
-
+
-
+VESA - output to VESA BIOS
@@ -1344,10 +1344,10 @@
itself only once during POST procedure.
-
+
-
+X11
@@ -1392,10 +1392,10 @@
drivers can't use low pixelclocks that are needed for low resolution
video modes.
-
+
-
+VIDIX
@@ -1541,7 +1541,7 @@
-
+ATI cards
Currently most ATI cards are supported natively, from Mach64 to the
@@ -1553,9 +1553,9 @@
rage128_vid for Rage 128 cards. You may force one or let
the VIDIX system autoprobe all available drivers.
-
+
-
+Matrox cards
Matrox G200, G400, G450 and G550 have been reported to work.
@@ -1565,9 +1565,9 @@
The driver supports video equalizers and should be nearly as fast as the
Matrox framebuffer
-
+
-
+Trident cards
There is a driver available for the Trident Cyberblade/i1 chipset, which
@@ -1578,17 +1578,17 @@
The driver was written and is maintained by
Alastair M. Robinson
-
+
-
+3DLabs cards
Although there is a driver for the 3DLabs GLINT R3 and Permedia3 chips, no one
has tested it, so reports are welcome.
-
+
-
+nVidia cards
There's a relatively new nVidia driver out there, it's known to work on Riva
@@ -1631,9 +1631,9 @@
Reports awaited!
-
+
-
+SiS cards
This is very experimental code, just like nvidia_vid.
@@ -1647,10 +1647,10 @@
Reports awaited!
-
+
-
+DirectFB
"DirectFB is a graphics library which was designed with embedded systems
@@ -1673,9 +1673,9 @@
be done by the subdevice method, e.g.:
(layer -1 is default: autodetect)
-
+
-
+DirectFB/Matrox (dfbmga)
Please read the main DirectFB section for general
@@ -1703,13 +1703,13 @@
mga_vid has been planned for years,
patches are welcome.
-
+
-
+MPEG decoders
-
+DVB output and inputMPlayer supports cards with the Siemens DVB chipset
@@ -1948,9 +1948,9 @@
non-25fps movies and realtime transcoding between MPEG-2 and MPEG-4 (partial
decompression).
-
+
-
+DXR2MPlayer supports hardware accelerated playback
with the Creative DXR2 card.
@@ -1988,9 +1988,9 @@
Please see the man page for available options.
-
+
-
+DXR3/Hollywood+MPlayer supports hardware accelerated playback
@@ -2112,14 +2112,14 @@
-
-
-
+
+
+Other visualization hardware
-
+Zr
@@ -2212,9 +2212,9 @@
start MPlayer, wait for MPlayer
to finish and THEN stop XawTV.
-
+
-
+Blinkenlights
This driver is capable of playback using the Blinkenlights UDP protocol. If you
@@ -2228,13 +2228,13 @@
On the Arcade video you can see the Blinkenlights output driver in
action at 00:07:50.
-
+
-
+TV-out support
-
+Matrox G400 cards
@@ -2374,9 +2374,9 @@
pins. (info contributed from Balázs Kerekes)
-
+
-
+Matrox G450/G550 cards
TV output support for these cards has only been recently introduced, and is
@@ -2400,10 +2400,10 @@
The necessary kernel patch and the detailed HOWTO is downloadable from
-
+
-
+ATI cards
@@ -2446,17 +2446,17 @@
plugged in before booting your PC since video BIOS initializes
itself only once during POST procedure.
-
+
-
+Voodoo 3
Check this URL.
-
+
-
+nVidia
First, you MUST download the closed-source drivers from .
@@ -2493,9 +2493,9 @@
Of course the important thing is the TwinView part.
-
+
-
+NeoMagic
The NeoMagic chip is found in a variety of laptops, some of them are equipped
@@ -2542,6 +2542,7 @@
-
+
+