summaryrefslogtreecommitdiffstats
path: root/DOCS/xml/en
diff options
context:
space:
mode:
Diffstat (limited to 'DOCS/xml/en')
-rw-r--r--DOCS/xml/en/codecs.xml21
-rw-r--r--DOCS/xml/en/documentation.xml6
-rw-r--r--DOCS/xml/en/history.xml7
-rw-r--r--DOCS/xml/en/install.xml57
-rw-r--r--DOCS/xml/en/video.xml30
5 files changed, 71 insertions, 50 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 2e055512d5..cad345d257 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -36,7 +36,7 @@ The most important ones above all:
native <emphasis role="bold">Sorenson 1 (SVQ1)</emphasis> decoder
</simpara></listitem>
<listitem><simpara>
- Win32/QT <emphasis role="bold">Sorenson 3 (SVQ3)</emphasis> decoder
+ native <emphasis role="bold">Sorenson 3 (SVQ3)</emphasis> decoder
</simpara></listitem>
<listitem><simpara>
<emphasis role="bold">3ivx</emphasis> v1, v2 decoder
@@ -194,7 +194,7 @@ did not install or configure it correctly.
<para>
<ulink url="http://ffmpeg.sourceforge.net">FFmpeg</ulink> contains an
<emphasis role="bold">open source</emphasis> codec package, which is capable
-of decoding streams encoded with H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/HuffYUV
+of decoding streams encoded with H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/HuffYUV/SVQ1/SVQ3
video, or WMA (Windows Media Audio) audio codecs. Not only some of them can be
encoded with, but it also offers higher speed than the Win32 codecs or the
DivX.com DivX4/5 library!
@@ -202,11 +202,18 @@ DivX.com DivX4/5 library!
<para>
It contains a lot of nice codecs, especially important are the MPEG4 variants:
-DivX3, DivX4, DivX5, Windows Media Video 7 (WMV1). Also a very interesting one
+DivX3, DivX4, DivX5, Windows Media Video 7/8 (WMV1/WMV2). Also a very interesting one
is the WMA decoder.
</para>
<para>
+The most recent codec deserving credit is the <emphasis role="bold">Sorenson 3</emphasis>
+(SVQ3) codec. This is the first, completely opensource implementation of this
+codec. It's even faster than the original. Be sure to prefer this instead
+of the binary codec!
+</para>
+
+<para>
If you use an <application>MPlayer</application> release you have libavcodec
right in the package, just build as usual. If you use
<application>MPlayer</application> from CVS you have to extract libavcodec from
@@ -489,7 +496,7 @@ then started XviD. So both projects have the same origin.
Sorenson is a video codec developed by Sorenson Media and licensed to Apple who
distribute it with their <application>QuickTime Player</application>. We are
currently able to decode all version of Sorenson video files with the following
-decoders.
+decoders:
</para>
<itemizedlist>
@@ -499,13 +506,11 @@ decoders.
(nearly equal) decoders for SVQ1: one is built in <application>MPlayer</application>,
the other in libavcodec. You can invoke each of them with the <option>-vc svq1</option>
and <option>-vc ffsvq1</option> options respectively. Some files may work
- with one of them, and not with the other, so test both decoders. The decoder
- was written (reverse engineered) by the <ulink url="http://www.xinehq.de">xine</ulink>
- authors.
+ with one of them, and not with the other, so test both decoders.
</simpara></listitem>
<listitem><simpara>
Sorenson 3 (fourcc <emphasis>SVQ3</emphasis>) - decoding supported by
- <emphasis role="bold">Win32 QuickTime libraries</emphasis>
+ <emphasis role="bold">native codec</emphasis> (<link linkend="ffmpeg">libavcodec</link>)
</simpara></listitem>
</itemizedlist>
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index 134ed4a8c7..84e7a23f16 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -71,7 +71,7 @@ or try grepping through the files.
<para>
The main rule of this documentation: if it's not documented, it
-<emphasis>does not exist.</emphasis> If I don't say you encode audio from
+<emphasis>does not exist.</emphasis> If I don't say you can encode audio from
TV tuner, you can't. A healthy quantity of combining ability is welcomed,
though. Good luck. You'll need it :) And for another good advice, let me
quote Chris Phillips from the
@@ -101,9 +101,9 @@ few seem to actually read the words on the OTHER side of the colon.
<application>MPlayer</application> is a movie player for Linux (runs on
many other Unices, and <emphasis role="bold">non-x86</emphasis> CPUs, see
<xref linkend="ports"/>). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV,
-QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, supported by
+QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA, Matroska files, supported by
many native, XAnim, RealPlayer, and Win32 DLL codecs. You can watch
-<emphasis role="bold">VideoCD, SVCD, DVD, 3ivx, RealMedia</emphasis>, and
+<emphasis role="bold">VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora</emphasis>, and
<emphasis role="bold">DivX</emphasis> movies too (and you don't need 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,
diff --git a/DOCS/xml/en/history.xml b/DOCS/xml/en/history.xml
index 5c41c90636..0dea018158 100644
--- a/DOCS/xml/en/history.xml
+++ b/DOCS/xml/en/history.xml
@@ -82,6 +82,13 @@ decided to write/modify one...
</para></listitem>
<listitem><para>
<emphasis role="bold">MPlayer 0.90 "The CounterCounter"</emphasis> Apr 6, 2003
+ </para><para>After more than 1 year, we finally concluded that the code was indeed
+ stable again, and ready to be published as a release. Unfortunately we
+ forgot even to increase the version number, and other annoying bugs went
+ in, so get ready for...
+ </para></listitem>
+<listitem><para>
+ <emphasis role="bold">MPlayer 0.91 "?"</emphasis> date yet unknown
</para></listitem>
</itemizedlist>
</para>
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index d2329009ca..690a62a405 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -29,12 +29,12 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
<emphasis role="bold">gcc</emphasis> - suggested versions are: <emphasis role="bold">2.95.3</emphasis>
(maybe <emphasis role="bold">2.95.4</emphasis>) and <emphasis role="bold">3.2+</emphasis>.
<emphasis role="bold">Never</emphasis> use 2.96 or 3.0.x! They generate faulty code for
- <application>MPlayer</application>. 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
+ <application>MPlayer</application>. If you decide to change gcc from
+ 2.96, then don't decide in favor of 3.x just because it's newer! Early
+ releases of 3.x were even more buggy than 2.96. So downgrade to 2.95.x
(downgrade <systemitem class="library">libstdc++</systemitem> too, other
programs may need it) or don't up/downgrade at all (but in this case, be
- prepared for runtime problems). If you vote for 3.x.x, try to use the
+ prepared for runtime problems). If you vote for 3.x, try to use the
latest version, early releases had various bugs, so be sure you use at
least 3.1, it's tested and working. For detailed information about gcc 2.96's
bugs (that are still NOT fixed, they have been WORKED AROUND in
@@ -43,7 +43,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
</para></listitem>
<listitem><para>
<emphasis role="bold">XFree86</emphasis> - suggested version is <emphasis role="bold">always the
- newest</emphasis> (4.3.0). Normally, everyone wants this, as starting
+ newest</emphasis> (4.3). Normally, everyone wants this, as starting
with XFree86 4.0.2, it contains the <link linkend="xv">XVideo</link>
extension (somewhere referred to as <emphasis role="bold">Xv</emphasis>)
which is needed to enable the hardware YUV acceleration (fast image display)
@@ -102,6 +102,9 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
<emphasis role="bold">libxmms</emphasis> - optional, for XMMS input plugin
support. At least 1.2.7 is required.
</para></listitem>
+<listitem><para>
+ <emphasis role="bold">libsmb</emphasis> - optional, for Samba support.
+ </para></listitem>
</itemizedlist>
</sect2>
@@ -112,7 +115,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
<itemizedlist>
<listitem><para>
<emphasis role="bold">libavcodec</emphasis>: This codec package is capable
- of decoding H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video
+ of decoding H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/SVQ1/SVQ3 encoded video
streams and WMA (Windows Media Audio) v1/v2 audio streams, on multiple
platforms. It is also known to be the fastest for this task. See
<link linkend="ffmpeg">this section</link> for details. Features:
@@ -149,7 +152,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
(example: DV, ATI VCR, MJPEG)
</simpara></listitem>
<listitem><simpara>
- needed if you want to play <emphasis role="bold">WMV8, WMV9/WMA9 movies</emphasis>.
+ needed if you want to play <emphasis role="bold">WMV9/WMA9 movies</emphasis>.
</simpara></listitem>
<listitem><simpara>
Not needed for old ASF's with MP41 or MP42 video (though VoxWare audio is
@@ -160,7 +163,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
</para></listitem>
<listitem><para>
<emphasis role="bold">QuickTime codecs</emphasis>: on x86 platforms these
- codecs can be used to decode Sorenson v1/v3, RPZA, and other QuickTime video,
+ codecs can be used to decode RPZA, and other QuickTime video,
and QDesign audio streams. Installation instructions can be found in the
<link linkend="sorenson">Sorenson video codec</link> section.
</para></listitem>
@@ -437,8 +440,9 @@ make install</screen>
At this point, <application>MPlayer</application> is ready to use. The
directory <filename class="directory">$PREFIX/share/mplayer</filename>
contains the <filename>codecs.conf</filename> file, which is used to tell
-the program all the codecs and their capabilities. This file should always
-be kept up to date together with the main binary. Check if you have
+the program all the codecs and their capabilities. This file is needed only
+when you want to change its properties, as the main binary contains an internal
+copy of it. Check if you have
<filename>codecs.conf</filename> in your home directory
(<filename>~/.mplayer/codecs.conf</filename>) left from old
<application>MPlayer</application> versions, and remove it.
@@ -549,6 +553,10 @@ destination formats, with the given options:
</para>
<para>
+MEncoder can dump DVD subtitles into <link linkend="menc-feat-extractsub">VobSub</link> format.
+</para>
+
+<para>
The command line options differ slightly for the different formats:
</para>
@@ -631,6 +639,7 @@ its main feature is being <emphasis>dynamically</emphasis> time-based (although
it has frame-based mode too). Example (from <ulink
url="../../tech/mpsub.sub">DOCS/tech/mpsub.sub</ulink>):
<programlisting>
+FORMAT=TIME
# first number : wait this much after previous subtitle disappeared
# second number : display the current subtitle for this many seconds
@@ -675,6 +684,19 @@ There are many ways to get it:
<itemizedlist>
<listitem><para>
+ using a TrueType (TTF) font, by the means of the <systemitem class="library">freetype</systemitem>
+library. Version 2.0.9 or greater is mandatory! Then you have two methods:
+ <itemizedlist>
+ <listitem><para>
+ use the <option>-font /path/to/arial.ttf</option> option to specify a
+ TrueType font file on every occasion
+ </para></listitem>
+ <listitem><para>
+ create a symlink:<screen>ln -s /path/to/arial.ttf ~/.mplayer/subfont.ttf</screen>
+ </para></listitem>
+ </itemizedlist>
+ </para></listitem>
+<listitem><para>
Download ready-to-use font packages from MPlayer site. Note: currently
available fonts are limited for ISO 8859-1/2 support, but there are some
other (including Korean, Russian, ISO 8859-8 etc) fonts at contrib/font
@@ -717,7 +739,7 @@ There are many ways to get it:
</tbody>
</tgroup>
</table>
-
+
</para></listitem>
<listitem><para>
Use the font generator tool at <filename
@@ -731,19 +753,6 @@ There are many ways to get it:
RAW plugin too, see URL below)
<!-- FIXME: where's that URL? -->
</para></listitem>
-<listitem><para>
- using a TrueType (TTF) font, by the means of the <systemitem class="library">freetype</systemitem>
-library. Version 2.0.9 or greater is mandatory! Then you have two methods:
- <itemizedlist>
- <listitem><para>
- use the <option>-font /path/to/arial.ttf</option> option to specify a
- TrueType font file on every occasion
- </para></listitem>
- <listitem><para>
- create a symlink:<screen>ln -s /path/to/arial.ttf ~/.mplayer/subfont.ttf</screen>
- </para></listitem>
- </itemizedlist>
- </para></listitem>
</itemizedlist>
<para>
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index a6971458b4..200a27af35 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -230,9 +230,8 @@ set refresh rate to a n*(fps of the movie) Hz.
</para>
<para>
-Radeon VE - currently only XFree86 CVS has driver for this card, version
-4.1.0 doesn't. And no TV out support. Of course with
-<application>MPlayer</application> you can
+Radeon VE - if you need X, use XFree86 4.2.0 or greater for this card.
+No TV out support. Of course with <application>MPlayer</application> you can
happily get <emphasis role="bold">accelerated</emphasis> display, with or without
<emphasis role="bold">TV output</emphasis>, and no libraries or X are needed.
Read the <link linkend="vidix">VIDIX</link> section.
@@ -244,18 +243,18 @@ Read the <link linkend="vidix">VIDIX</link> section.
<title>NeoMagic cards</title>
<para>
-These cards can be found in many laptops. Unfortunately, the driver in
-XFree prior to 4.3.0 cannot do Xv, but Stefan Seyfried provided
+These cards can be found in many laptops. You must use XFree86 4.3.0 or
+above, or else use Stefan Seyfried's
<ulink url="http://www.mplayerhq.hu/MPlayer/contrib/NeoMagic-driver/">Xv-capable drivers</ulink>.
-Just choose the one that applies to your version of Xfree.
+Just choose the one that applies to your version of XFree86.
</para>
<para>
XFree86 4.3.0 includes Xv support, yet Bohdan Horst sent a small
<ulink url="http://www.mplayerhq.hu/MPlayer/contrib/NeoMagic-driver/neo_driver.patch">patch</ulink>
-against the XFree86 sources that speeds up framebuffer operations up to four
-times. The patch has been included in XFree86 CVS and should be in the next
-release after 4.3.0.
+against the XFree86 sources that speeds up framebuffer operations (so XVideo)
+up to four times. The patch has been included in XFree86 CVS and should be in the
+next release after 4.3.0.
</para>
<para>
@@ -815,14 +814,13 @@ If you want to change to a specific mode, then use
<filename>/etc/fb.modes</filename>. Can be used together with
<option>-x</option> and <option>-y</option> options too. The
<option>-flip</option> option is supported only if the movie's pixel
- format matches the video mode's pixel format. Pay attention to the bpp
+ format matches the video mode's pixel format. Pay attention to the bpp
value, fbdev driver tries to use the current, or if you specify the
<option>-bpp</option> option, then that.
</para></listitem>
<listitem><para>
- <option>-zoom</option> option isn't supported (software scaling is slow).
- <option>-fs</option> option isn't supported. You can't use 8 bpp (or less)
- modes.
+ <option>-zoom</option> option isn't supported (use <option>-vf scale</option>).
+ You can't use 8bpp (or less) modes.
</para></listitem>
<listitem><para>
You possibly want to turn the cursor off:
@@ -1511,8 +1509,10 @@ or directly on Ville Syrjala's
</para>
<note><para>
-we haven't been able to make this work, but others did. Anyway, porting of
-the CRTC2 code to <emphasis role="bold">mga_vid</emphasis> is underway.
+the first DirectFB version with which we could kick this working was
+0.9.17 (it's buggy, needs that <systemitem>surfacemanager</systemitem> patch from
+the URL above). Anyway, porting of the CRTC2 code to <emphasis role="bold">mga_vid</emphasis>
+is underway.
</para></note>
</sect4>
</sect3>