Mercurial > mplayer.hg

changeset 9282:513e02e2e553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing others' 10/100liters
author gabucino
date Tue, 04 Feb 2003 21:38:31 +0000
parents 1a11de853e51
children 2d52b07c58b1
files DOCS/bugreports.html DOCS/codecs.html DOCS/encoding.html DOCS/mplayer.1 DOCS/sound.html DOCS/video.html
diffstat 6 files changed, 43 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/bugreports.html	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/bugreports.html	Tue Feb 04 21:38:31 2003 +0000
@@ -86,7 +86,7 @@
   subscribe to actually receive your answer.</P>
 
 
-<H2><A NAME ="what">B.4 What to report</A></H2>
+<H2><A NAME="what">B.4 What to report</A></H2>
 
 <P>You may need to include log, configuration or sample files in your bug
   report. If some of them are quite big then it is better to upload them to our
--- a/DOCS/codecs.html	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/codecs.html	Tue Feb 04 21:38:31 2003 +0000
@@ -198,7 +198,7 @@
     have filenames like these: <CODE>vid_cvid.xa, vid_h263.xa, vid_iv50.xa</CODE>.</LI>
 </OL>
 
-<P>XAnim is video codec family <I>xanim</I>, so you may want to use the <CODE>-vfm xanim</CODE>
+<P>XAnim is video codec family <CODE>xanim</CODE>, so you may want to use the <CODE>-vfm xanim</CODE>
   option to tell MPlayer to use them if possible.</P>
 
 <P>Tested codecs include: <B>Indeo 3.2</B>, <B>4.1</B>, <B>5.0</B>, <B>CVID</B>,
--- a/DOCS/encoding.html	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/encoding.html	Tue Feb 04 21:38:31 2003 +0000
@@ -160,12 +160,12 @@
 
 <H3><A NAME="appending">7.5.1 Appending multiple AVI files</A></H3>
 
-<P>As a side-effect of fixing broken AVI files, MEncoder can be used to fix the
-  result of appending 2 (or more) AVI files:</P>
+<P>As a side-effect, the broken AVI fixer function enables MEncoder to append
+  2 (or more) AVI files:</P>
 
 <P>Command: <CODE>cat 1.avi 2.avi | mencoder -noidx -ovc copy -oac copy -o output.avi -</CODE></P>
 
-<P><B>Note:</B> This expects 1.avi and 2.avi to use the same codecs, resolution,
+<P><B>Note:</B> This expects <CODE>1.avi</CODE> and <CODE>2.avi</CODE> to use the same codecs, resolution,
   stream rate etc, and at least 1.avi must not be broken. You may need to fix
   your input AVI files first, as described <A HREF="#fixing">above</A>.</P>
 
--- a/DOCS/mplayer.1	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/mplayer.1	Tue Feb 04 21:38:31 2003 +0000
@@ -452,7 +452,7 @@
 channel is repeated in both output channels).
 If the number of output channels is smaller than the number of input channels,
 results depend on the audio decoder (\-afm).
-Mplayer asks the decoder to decode the audio into as many channels as
+MPlayer asks the decoder to decode the audio into as many channels as
 specified.
 Now it's up to the decoder to fulfill the requirement.
 If the decoder outputs more channels than requested, the exceeding channels
@@ -556,7 +556,7 @@
 .B \-hr\-mp3\-seek (.MP3 only)
 Hi\-res mp3 seeking.
 Default is: enabled when playing from external MP3 file, as we need to seek
-to the very exact position to keep A/\:V sync.It can be slow especially when
+to the very exact position to keep A/\:V sync. It can be slow especially when
 seeking backwards \- it has to rewind to the beginning to find the exact
 frame.
 .TP
@@ -726,8 +726,7 @@
 .IPs fps=<value>
 framerate at which to capture video (frames per second)
 .IPs buffersize=<value>
-maximum size of the capture buffer in megabytes (default: half of the
-physical memory)
+maximum size of the capture buffer in megabytes (default: dynamical)
 .IPs norm=<value>
 available: PAL, SECAM, NTSC
 .IPs channel=<value>
@@ -740,7 +739,7 @@
 The channel names will then be written using OSD, and the commands tv_step_channel,
 tv_set_channel and tv_last_channel will then be usable using a remote (see lirc).
 Not compatible with frequency parameter.
-Warning : The channel number will then be the position in the 'channels' list,
+Warning: The channel number will then be the position in the 'channels' list,
 beginning with 1.
 Example: use tv://1, tv://2, tv_set_channel 1, tv_set_channel 2, etc.
 .IPs audiorate=<value>
@@ -866,7 +865,6 @@
 With FreeType, this option determines path to the text font file.
 .br
 The \-subfont-* options are available only with FreeType support compiled in.
-If FreeType support is enabled, the old font support can't be used.
 
 .I EXAMPLE:
 .PD 0
--- a/DOCS/sound.html	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/sound.html	Tue Feb 04 21:38:31 2003 +0000
@@ -105,7 +105,7 @@
     <TH COLSPAN="4"><B>DRIVER</B></TH>
     <TH ROWSPAN="2"><B>Max kHz</B></TH>
     <TH ROWSPAN="2"><B>Max Channels</B></TH>
-    <TH ROWSPAN="2"><B>Max Opens</B></TH>
+    <TH ROWSPAN="2"><B>Max Opens<FONT SIZE="-2"><A HREF=#note1>[1]</A></FONT></B></TH>
   </TR>
 
   <TR>
@@ -251,7 +251,7 @@
 
   <TR>
     <TD><B>PC Speaker or DAC</B></TD>
-    <TD>OK (Use the SDL driver: <CODE>-ao sdl</CODE>)</TD>
+    <TD>OK</TD>
     <TD>none</TD>
     <TD>&nbsp;</TD>
     <TD><A HREF="http://www.geocities.com/stssppnn/pcsp.html">Linux PC speaker OSS driver</a></TD>
@@ -262,6 +262,9 @@
 
 </TABLE>
 
+<P><A NAME="note1"><B>[1]</B></A>: the number of applications that are able to use the
+  device <I>at the same time</I>.</P>
+
 <P>Feedback to this document is welcome. Please tell us how MPlayer
   and your sound card(s) worked together.</P>
 
--- a/DOCS/video.html	Tue Feb 04 21:07:09 2003 +0000
+++ b/DOCS/video.html	Tue Feb 04 21:38:31 2003 +0000
@@ -220,13 +220,13 @@
 <H4><A NAME="dga">2.3.1.2.2 DGA</A></H4>
 
 
-<H5>PREAMBLE</H5>
+<H4>PREAMBLE</H4>
 
 <P>This section tries to explain in some words what DGA is in general and what
   the DGA video output driver for MPlayer can do (and what it can't).</P>
 
 
-<H5>WHAT IS DGA</H5>
+<H4>WHAT IS DGA</H4>
 
 <P>DGA is short for Direct Graphics Access and is a means for a program to
   bypass the X-Server and directly modifying the framebuffer memory.
@@ -253,7 +253,7 @@
   driver that controls this chip. So it does not work on every system.</P>
 
 
-<H5>INSTALLING DGA SUPPORT FOR MPLAYER</H5>
+<H4>INSTALLING DGA SUPPORT FOR MPLAYER</H4>
 
 <P>First make sure X loads the DGA extension, see in /var/log/XFree86.0.log:</P>
 
@@ -290,7 +290,7 @@
   much faster.</P>
 
 
-<H5>RESOLUTION SWITCHING</H5>
+<H4>RESOLUTION SWITCHING</H4>
 
 <P>The DGA driver allows for switching the resolution of the output signal. 
   This avoids the need for doing (slow) software scaling and at the same time
@@ -322,7 +322,7 @@
 </PRE>
 
 
-<H5>DGA &amp; MPLAYER</H5>
+<H4>DGA &amp; MPLAYER</H4>
 
 <P>DGA is used in two places with MPlayer: The SDL driver can be made to
   make use of it (-vo sdl:dga) and within the DGA driver (-vo dga). The above
@@ -330,7 +330,7 @@
   driver for MPlayer works.</P>
 
 
-<H5>FEATURES</H5>
+<H4>FEATURES</H4>
 
 <P>The DGA driver is invoked by specifying -vo dga at the command line.
   The default behavior is to switch to a resolution matching the original
@@ -369,7 +369,7 @@
   CPU time!) depending on the implementation of DGA for your hardware.</P>
 
 
-<H5>SPEED ISSUES</H5>
+<H4>SPEED ISSUES</H4>
 
 <P>Generally spoken, DGA framebuffer access should be at least as fast as using
   the X11 driver with the additional benefit of getting a fullscreen image. 
@@ -394,7 +394,7 @@
   CPUs might work at 400 MHZ and above.</P>
 
 
-<H5>KNOWN BUGS</H5>
+<H4>KNOWN BUGS</H4>
 
 <P>Well, according to some developers of XFree, DGA is quite a beast. They
   tell you better not to use it. Its implementation is not always flawless
@@ -460,7 +460,7 @@
   <TR><TD></TD><TD><CODE>W/S</CODE></TD><TD></TD><TD>mappings for * and / (mixer control)</TD></TR>
 </TABLE>
 
-<H5>KNOWN BUGS</H5>
+<H4>KNOWN BUGS</H4>
 
 <UL>
   <LI>Keys pressed under sdl:aalib console driver repeat forever. (use -vo aa!)
@@ -471,20 +471,20 @@
 
 <H4><A NAME="svgalib">2.3.1.2.4 SVGAlib</A></H4>
 
-<H5>INSTALLATION</H5>
+<H4>INSTALLATION</H4>
 
 <P>You'll have to install svgalib and its development package in order for
   MPlayer build its SVGAlib driver (autodetected, but can be forced),
   and don't forget to edit /etc/vga/libvga.config to suit your card &amp;
   monitor.</P>
 
-<H5>NOTES</H5>
+<H4>NOTES</H4>
 
 <P>Be sure not to use the -fs option, since it toggles the usage of the software
   scaler, and it's slow. If you really need it, use the <CODE>-sws 4</CODE>
   option which will produce bad quality, but is somewhat faster.</P>
 
-<H5>EGA (4BPP) SUPPORT</H5>
+<H4>EGA (4BPP) SUPPORT</H4>
 
 <P>SVGAlib incorporates EGAlib, and MPlayer has the possibility to
   display any movie in 16 colors, thus usable in the following sets:</P>
@@ -725,7 +725,7 @@
   (I guess that TV-out frequently is standalone head or standalone output
   at least.)</P>
 
-<H5>ADVANTAGES</H5>
+<H4>ADVANTAGES</H4>
 
 <UL>
   <LI>You have the possibility to watch movies <B>even if Linux doesn't know</B>
@@ -747,7 +747,7 @@
     <B>all</B> your monitor options.</LI>
 </UL>
 
-<H5>DISADVANTAGES</H5>
+<H4>DISADVANTAGES</H4>
 
 <UL>
   <LI>It works only on <B>x86 systems</B>.</LI>
@@ -757,7 +757,7 @@
 
 <P>Don't use this driver with <B>GCC 2.96</B>! It won't work!</P>
 
-<H5>COMMAND LINE OPTIONS AVAILABLE FOR VESA</H5>
+<H4>COMMAND LINE OPTIONS AVAILABLE FOR VESA</H4>
 <DL>
   <DT><CODE>-vo vesa:opts</CODE></DT>
   <DD>currently recognized: <B>dga</B> to force dga mode and <B>nodga</B> to
@@ -766,7 +766,7 @@
     <B>autodetection</B> of dga mode.</DD>
 </DL>
 
-<H5>KNOWN PROBLEMS AND WORKAROUNDS</H5>
+<H4>KNOWN PROBLEMS AND WORKAROUNDS</H4>
 
 <UL>
   <LI>If you have installed <B>NLS</B> font on your Linux box and run VESA
@@ -820,7 +820,7 @@
 
 <H4><A NAME="vidix">2.3.1.2.12 VIDIX</A></H4>
 
-<H5>PREAMBLE</H5>
+<H4>PREAMBLE</H4>
 
 <P>VIDIX is the abbreviation for <B>VID</B>eo <B>I</B>nterface for *ni<B>X</B>.
   It was designed and introduced as an interface for fast user-space drivers
@@ -835,7 +835,7 @@
   team in graphics mode switching). I.e. main goal of this interface is to
   maximize the speed of video playback.</P>
 
-<H5>USAGE</H5>
+<H4>USAGE</H4>
 
 <UL>
   <LI>You can use standalone video output driver: <CODE>-vo xvidix</CODE><BR>
@@ -855,7 +855,7 @@
 
 Indeed it doesn't matter which video output driver is used with <B>VIDIX</B>.
 
-<H5>REQUIREMENTS</H5>
+<H4>REQUIREMENTS</H4>
 
 <UL>
   <LI>video card should be in graphics mode (I write <B>should</B> simply
@@ -867,7 +867,7 @@
     able to tell to VIDIX subdevice some video characteristics of server.</LI>
 </UL>
 
-<H5>USAGE METHODS</H5>
+<H4>USAGE METHODS</H4>
 
 <P>When VIDIX is used as <B>subdevice</B> (<CODE>-vo vesa:vidix</CODE>) then
   video mode configuration is performed by video output device
@@ -905,11 +905,12 @@
 <OL>
   <LI>Download the
     <A HREF="http://www.arava.co.il/matan/svgalib/">development version</A>
-    of svgalib (for example 1.9.17).</LI>
-  <LI><B>OR</B> download a version made by Alex especially for usage with
+    of svgalib (for example 1.9.17),<BR>
+    <B>OR</B><BR>
+    download a version made by Alex especially for usage with
     MPlayer (it doesn't need the svgalib source to compile) from
     <A HREF="http://www.mplayerhq.hu/~alex/svgalib_helper-1.9.17-mplayer.tar.bz2">
-    here</A>.
+    here</A>.</LI>
   <LI>Compile the module in the <CODE>svgalib_helper</CODE> directory (it can
     be found inside the <CODE>svgalib-1.9.17/kernel/</CODE> directory if you've
     downloaded the source from the svgalib site) and insmod it.</LI>
@@ -1018,7 +1019,7 @@
 
 <P>Then compile and install as usual.</P>
 
-<H5>USAGE</H5>
+<H4>USAGE</H4>
 
 <P>Hardware decoding (playing standard MPEG1/2 files) can be done with this
   command:</P>
@@ -1087,7 +1088,7 @@
 for 16:9 TV: -vop lavc,expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024
 </PRE>
 
-<H5>FUTURE</H5>
+<H4>FUTURE</H4>
 
 <P>If you have questions or want to hear feature announcements and take part in
   discussions on this subject, join our
@@ -1117,7 +1118,7 @@
   Linux</A> site. Configure should detect your card automatically, compilation
   should go without problems.</P>
 
-<H5>USAGE</H5>
+<H4>USAGE</H4>
 <DL>
   <DT><CODE>-vo dxr3:prebuf:sync:norm=x:&lt;device&gt;</CODE></DT>
   <DD><CODE>overlay</CODE> activates the overlay instead of TVOut. It requires
@@ -1398,12 +1399,12 @@
 
 <H4><A NAME="tv-out_ati">2.3.1.5.3 ATI cards</A></H4>
 
-<H5>PREAMBLE</H5>
+<H4>PREAMBLE</H4>
 
 <P>Currently ATI doesn't want to support any of its TV-out chips under Linux,
   because of their licensed Macrovision technology.</P>
 
-<H5>ATI CARDS TV-OUT STATUS ON LINUX</H5>
+<H4>ATI CARDS TV-OUT STATUS ON LINUX</H4>
 
 <UL>
   <LI><B>ATI Mach64</B>: Supported by