diff options
| author |  gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 17:11:57 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 17:11:57 +0000 |
| commit | d6178fc7e8770a22404910260ab07201b9589010 (patch) | |
| tree | 72fa3b875a50a0a88140f6da5f945c0b2ee10b9d | |
| parent | 9cc4443e5737ea1cd8b7178a3d394e7a32d37dfe (diff) | |
changing "switch" -> "option" (unwritten DOCS rule)
other important fixes, updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9139 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/codecs.html | 2 | ||||
| -rw-r--r-- | DOCS/documentation.html | 47 | ||||
| -rw-r--r-- | DOCS/encoding.html | 21 | ||||
| -rw-r--r-- | DOCS/faq.html | 8 | ||||
| -rw-r--r-- | DOCS/formats.html | 2 | ||||
| -rw-r--r-- | DOCS/sound.html | 66 | ||||
| -rw-r--r-- | DOCS/video.html | 14 |
7 files changed, 79 insertions, 81 deletions
diff --git a/DOCS/codecs.html b/DOCS/codecs.html index 9452667a6e..acac2c5813 100644 --- a/DOCS/codecs.html +++ b/DOCS/codecs.html @@ -243,7 +243,7 @@ MPlayer supports decoding all versions of RealVideo: 4.0 video. The MPlayer configure script should detect the RealPlayer libraries in the standard locations of a full installation. If it does not, tell configure where to look with the - <CODE>--with-reallibdir</CODE> switch.</P> + <CODE>--with-reallibdir</CODE> option.</P> <P><B>Note:</B> RealPlayer libraries currently <B>only work with Linux, FreeBSD, NetBSD and Cygwin on the x86 and Alpha platforms.</B></P> diff --git a/DOCS/documentation.html b/DOCS/documentation.html index 704eb8b1bd..17792f85a1 100644 --- a/DOCS/documentation.html +++ b/DOCS/documentation.html @@ -278,39 +278,18 @@ <LI><A HREF="encoding.html">7. Encoding with MEncoder</A> <UL> <LI><A HREF="encoding.html#2pass">7.1 Encoding 2 or 3-pass MPEG-4 ("DIVX")</A></LI> - <LI><A HREF="encoding.html#rescaling">7.2 Rescaling movies</A></LI> - <LI><A HREF="encoding.html#copying">7.3 Stream copying</A></LI> - <LI><A HREF="encoding.html#fixing">7.4 Fixing AVIs with broken index</A></LI> - <LI><A HREF="encoding.html#libavcodec">7.5 Encoding with the libavcodec codec family</A></LI> - <LI><A HREF="encoding.html#image_files">7.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI> - <LI><A HREF="encoding.html#vobsub">7.7 Extracting DVD subtitles to a Vobsub file</A></LI> - <LI><A HREF="encoding.html#aspect">7.8 Preserving aspect ratio</A></LI> + <LI><A HREF="encoding.html#mpeg">7.2 Encoding to MPEG format</A></LI> + <LI><A HREF="encoding.html#rescaling">7.3 Rescaling movies</A></LI> + <LI><A HREF="encoding.html#copying">7.4 Stream copying</A></LI> + <LI><A HREF="encoding.html#fixing">7.5 Fixing AVIs with broken index</A></LI> + <LI><A HREF="encoding.html#libavcodec">7.6 Encoding with the libavcodec codec family</A></LI> + <LI><A HREF="encoding.html#image_files">7.7 Encoding from multiple input image files (JPEGs or PNGs)</A></LI> + <LI><A HREF="encoding.html#vobsub">7.8 Extracting DVD subtitles to a Vobsub file</A></LI> + <LI><A HREF="encoding.html#aspect">7.9 Preserving aspect ratio</A></LI> </UL> </LI> <LI><A HREF="#mailing_lists">Appendix A - Mailing lists</A></LI> - <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A> - <UL> - <LI><A HREF="bugreports.html#fix">B.1 How to fix bugs</A></LI> - <LI><A HREF="bugreports.html#report">B.2 How to report bugs</A></LI> - <LI><A HREF="bugreports.html#where">B.3 Where to report bugs</A></LI> - <LI><A HREF="bugreports.html#what">B.4 What to report</A> - <UL> - <LI><A HREF="bugreports.html#system">B.4.1 System information</A></LI> - <LI><A HREF="bugreports.html#hardware">B.4.2 Hardware and Drivers</A></LI> - <LI><A HREF="bugreports.html#compilation">B.4.3 Compilation problems</A></LI> - <LI><A HREF="bugreports.html#configure">B.4.4 Configure problems</A></LI> - <LI><A HREF="bugreports.html#playback">B.4.5 Playback problems</A></LI> - <LI><A HREF="bugreports.html#crash">B.4.6 Crashes</A> - <UL> - <LI><A HREF="bugreports.html#debug">B.4.6.1 How to conserve information about a reproducible crash</A></LI> - <LI><A HREF="bugreports.html#core">B.4.6.2 How to extract meaningful information from a core dump</A></LI> - </UL> - </LI> - </UL> - </LI> - <LI><A HREF="bugreports.html#advusers">B.5 I know what I am doing...</A></LI> - </UL> - </LI> + <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A></LI> <LI><A HREF="#known_bugs">Appendix C - Known bugs</A></LI> <LI><A HREF="skin.html">Appendix D - MPlayer skin format</A> <UL> @@ -1104,7 +1083,7 @@ There are three timing methods in MPlayer. The power management functions of some notebook BIOSes with speedstep CPUs interact badly with RTC. Audio and video may get out of sync. Plugging the external power connector in before you power up your notebook seems to help. - You can always turn off RTC support with the <CODE>-nortc</CODE> switch. + You can always turn off RTC support with the <CODE>-nortc</CODE> option. In some hardware combinations (confirmed during usage of non-DMA DVD drive on an ALi1541 board) usage of the RTC timer causes skippy playback. It's recommended to use the third method in these cases.</LI> @@ -1360,7 +1339,7 @@ on:driver=v4l:width=640:height=480 -vo xv</CODE><BR> using a simple config file. The syntax consist of a key name followed by a command. The default config file location is <CODE>$HOME/.mplayer/input.conf</CODE> but it can be overridden using the - <CODE>-input</CODE> conf switch (relative path are relative to + <CODE>-input</CODE> conf option (relative path are relative to <CODE>$HOME/.mplayer</CODE>). <P>Example:</P> @@ -1548,13 +1527,13 @@ end </PRE> <P>If you don't like the standard location for the lirc-config file (~/.lircrc) - use the -lircconf <filename> switch to specify another file.</P> + use the -lircconf <filename> option to specify another file.</P> <H3><A NAME="slave">3.2.3 Slave mode</A></H3> <P>The slave mode allow you to build simple frontend to MPlayer. When - enabled (with the <CODE>-slave</CODE> switch) MPlayer will read + enabled (with the <CODE>-slave</CODE> option) MPlayer will read commands separated by new line (\n) from stdin.</P> diff --git a/DOCS/encoding.html b/DOCS/encoding.html index 7a3e57638c..a7e7592111 100644 --- a/DOCS/encoding.html +++ b/DOCS/encoding.html @@ -87,6 +87,25 @@ -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE></P> +<H2><A NAME="mpeg">7.1 Encoding to MPEG format</A></H2> + +<P>MEncoder can create MPEG (MPEG-PS) format output files. It's probably + useful only with libavcodec's <I>mpeg1video</I> codec, because players + - except MPlayer - expect MPEG1 video, and MPEG1 layer 2 (MP2) audio streams + in MPEG files.</P> + +<P>This feature is not very useful right now, aside that it probably has + many bugs, but the more importantly because MEncoder currently cannot encode + MPEG1 layer 2 (MP2) audio, which all other players expect in MPEG files.</P> + +<P>To change MEncoder's output file format, use the <CODE>-of mpeg</CODE> + option.</P> + +<P>Example:<BR> + <CODE>mencoder -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video + -oac copy <other options> media.avi -o output.mpg</CODE></P> + + <H2><A NAME="rescaling">7.2 Rescaling movies</A></H2> <P>Often the need to resize movie images' size emerges. Its reasons can be @@ -185,7 +204,7 @@ Explanation of the process: <H4>Examples</H4> <P>The explanation of the <CODE>-mf</CODE> option can be found below in the - global <A HREF="#options">Options</A> section and in the man page.</P> + man page.</P> <P><I>Creating a DivX4 file from all the JPEG files in the current dir:</I><BR> <CODE>mencoder -mf on:w=800:h=600:fps=25 -ovc divx4 diff --git a/DOCS/faq.html b/DOCS/faq.html index adbf30ee2c..37a8b23a8b 100644 --- a/DOCS/faq.html +++ b/DOCS/faq.html @@ -257,7 +257,7 @@ <DD>A: It does, but you have to explicitly specify software scaling (very slow) with the <CODE>-zoom</CODE> option. You better use XF86VidMode support: You must specify the <CODE>-vm</CODE> and the <CODE>-fs</CODE> - switch, and you're done. Make sure you have the right modelines in your + option, and you're done. Make sure you have the right modelines in your XF86Config file, and try to make the <A HREF="video.html#dga">DGA driver</A> and <A HREF="video.html#sdl">SDL's DGA driver</A> work for you. It's much faster. If SDL's DGA works, use that, it'll be even faster.</DD> @@ -431,7 +431,7 @@ <DD> </DD> <DT>Q: My computer plays M$ DivX AVIs with resolutions ~ 640x300 and stereo - mp3 sound too slow. When I use -nosound switch, everything is OK (but + mp3 sound too slow. When I use -nosound option, everything is OK (but quiet).</DT> <DD>A: Your machine is too slow or your soundcard driver is broken. Consult the documentation to see if you can improve performance.</DD> @@ -539,7 +539,7 @@ my notebook. It works normal when i run it as a user.</DT> <DD>A: This is again a power management effect (see above). Plug the external power connector in <B>before</B> you power on your notebook or use the - <CODE>-nortc</CODE> switch.</DD> + <CODE>-nortc</CODE> option.</DD> </DL> @@ -560,7 +560,7 @@ </DT> <DD>A: Are you running KDE or GNOME with the ARTS or ESD sound daemon? Try disabling the sound daemon or use the <CODE>-ao arts</CODE> or - <CODE>-ao esd</CODE> switch to make MPlayer use ARTS or ESD.</DD> + <CODE>-ao esd</CODE> option to make MPlayer use ARTS or ESD.</DD> <DD> </DD> <DT>Q: What about the DGA driver? I can't find it!</DT> diff --git a/DOCS/formats.html b/DOCS/formats.html index d7b90dc91b..52ba8fea39 100644 --- a/DOCS/formats.html +++ b/DOCS/formats.html @@ -314,7 +314,7 @@ <CODE>./configure --enable-xmms</CODE>. If that does not work, you might need to set the XMMS plugin and library path explicitly by way of the <CODE>--with-xmmsplugindir</CODE> and <CODE>--withxmmslibdir</CODE> - switches.</P> + options.</P> </BODY> </HTML> diff --git a/DOCS/sound.html b/DOCS/sound.html index 53fcca72ee..3b5aff2b56 100644 --- a/DOCS/sound.html +++ b/DOCS/sound.html @@ -237,7 +237,7 @@ is normally automated but can be overridden. The filters are activated when the properties of the audio data differ from those required by the sound card and deactivated if unnecessary. The <CODE>-af filter1,filter2,...</CODE> - switch is used to override the automatic activation of filters or to insert + option is used to override the automatic activation of filters or to insert filters that are not automatically inserted. The filters will be executed as they appear in the comma separated list.</P> @@ -247,10 +247,10 @@ <P>would run the sound through the resampling filter followed by the pan filter. Observe that the list must not contain any spaces, else it will fail.</P> -<P>The filters often have switches that change their behavior. These switches +<P>The filters often have options that change their behavior. These options are explained in detail in the sections below. A filter will execute using - default settings if its switches are omitted. Here is an example of how to use - filters in combination with filter specific switches:</P> + default settings if its options are omitted. Here is an example of how to use + filters in combination with filter specific options:</P> <P> <CODE>mplayer -af resample=11025,pan=1:0.5:0.5 -channels 1 -srate 11025 media.avi</CODE></P> @@ -259,7 +259,7 @@ the audio to 1 channel using the pan filter.</P> <P>The overall execution of the filter layer is controlled using the - <CODE>-af-adv</CODE> switch. This switch has two suboptions:</P> + <CODE>-af-adv</CODE> option. This option has two suboptions:</P> <DL> <DT><CODE>force</CODE><DT> @@ -296,28 +296,30 @@ </DD> <DT><CODE>list</CODE></DT> - <DD>is an alias for the -af switch.</DD> + <DD>is an alias for the -af option.</DD> </DL> -<P>The filter layer is also affected by the following generic switches: +<P>The filter layer is also affected by the following generic options: <DL> <DT><CODE>-v</CODE></DT> <DD>Increases the verbosity level and makes most filters print out extra status messages.</DD> <DT><CODE>-channels</CODE></DT> - <DD>This option sets the number of output channels your sound card is using. + <DD>This option sets the number of output channels you would like your + sound card to use. It also affects the number of channels that are being decoded from the media. If the media contains less channels than requested the channels filter (see below) will automatically be inserted. The routing will be the default routing for the channels filter.</DD> <DT><CODE>-srate</CODE></DT> - <DD>This option selects the sample rate of your sound card. If the sample + <DD>This option selects the sample rate you would like your sound card to + use (of course the cards have limits on this). If the sample frequency of your sound card is different from that of the current media, the resample filter (see below) will be inserted into the audio filter layer to compensate for the difference.</DD> <DT><CODE>-format</CODE><DT> - <DD>This option sets the sample format of the audio filter layer and the sound + <DD>This option sets the sample format between the audio filter layer and the sound card. If the requested sample format of your sound card is different from that of the current media, a format filter (see below) will be inserted to rectify the difference.</DD> @@ -331,7 +333,7 @@ have a fixed frequency sound card or if you are stuck with an old sound card that is only capable of max 44.1kHz. This filter is automatically enabled if it is necessary, but it can also be explicitly enabled on the command line. It - has three switches:</P> + has three options:</P> <DL> <DT><CODE>srate <8000-192000></CODE></DT> @@ -344,7 +346,7 @@ <DT><CODE>sloppy</CODE></DT> <DD>is an optional binary parameter that allows the output frequency to differ - slightly from the frequency given by <CODE>srate</CODE>. This switch can be + slightly from the frequency given by <CODE>srate</CODE>. This option can be used if the startup of the playback is extremely slow. It is enabled by default.</DD> @@ -373,12 +375,12 @@ channels, it can also be used for routing or copying channels. It is automatically enabled when the output from the audio filter layer differs from the input layer or when it is requested by another filter. This filter unloads - itself if not needed. The number of switches is dynamic:</P> + itself if not needed. The number of options is dynamic:</P> <DL> <DT><CODE>nch <1-6></CODE></DT> <DD>is an integer between <CODE>1</CODE> and <CODE>6</CODE> that is used for - setting the number of output channels. This switch is required, leaving it + setting the number of output channels. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>nr <1-6></CODE></DT> @@ -421,7 +423,7 @@ <DL> <DT><CODE>bps <number></CODE></DT> <DD>can be <CODE>1</CODE>, <CODE>2</CODE> or <CODE>4</CODE> and denotes the - number of bytes per sample. This switch is required, leaving it empty + number of bytes per sample. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>f <format></CODE></DT> @@ -429,7 +431,7 @@ concatenated mix of: <CODE>alaw</CODE>, <CODE>mulaw</CODE> or <CODE>imaadpcm</CODE>, <CODE>float</CODE> or <CODE>int</CODE>, <CODE>unsigned</CODE> or <CODE>signed</CODE>, <CODE>le</CODE> or - <CODE>be</CODE> (little or big endian). This switch is required, leaving it + <CODE>be</CODE> (little or big endian). This option is required, leaving it empty results in a runtime error.</DD> </DL> @@ -485,7 +487,7 @@ If there is an external amplifier connected to the computer (this is almost always the case), the noise level can be minimized by adjusting the master level and the volume knob on the amplifier until the hissing noise in the - background is gone. This filter has two switches:</P> + background is gone. This filter has two options:</P> <DL> <DT><CODE>v <-200 - +60></CODE></DT> @@ -495,7 +497,7 @@ <DT><CODE>c</CODE></DT> <DD>is a binary control that turns soft clipping on and off. Soft-clipping can make the sound more smooth if very high volume levels are used. Enable this - switch if the dynamic range of the loudspeakers is very low. Be aware that + option if the dynamic range of the loudspeakers is very low. Be aware that this feature creates distortion and should be considered a last resort.</DD> </DL> @@ -554,11 +556,11 @@ canceling it almost completely around 1kHz.</P> -<H5><A NAME="af_panning">2.3.2.3.7 Panning filter </A></H5> +<H5><A NAME="af_panning">2.3.2.3.7 Panning filter</A></H5> <P>Use the <CODE>pan</CODE> filter to mix channels arbitrarily. It is basically a combination of the volume control and the channels filter. There are two - major uses for this filter: </P> + major uses for this filter:</P> <OL> <LI>Down-mixing many channels to only a few, stereo to mono for example.</LI> @@ -566,13 +568,13 @@ </OL> <P>This filter is hard to use, and will require some tinkering before the - desired result is obtained. The number of switches for this filter depends on + desired result is obtained. The number of options for this filter depends on the number of output channels:</P> <DL> <DT><CODE>nch <1-6></CODE></DT> <DD>is an integer between <CODE>1</CODE> and <CODE>6</CODE> and is used for - setting the number of output channels. This switch is required, leaving it + setting the number of output channels. This option is required, leaving it empty results in a runtime error.</DD> <DT><CODE>l00:l01:l02:..l10:l11:l12:...ln0:ln1:ln2:...</CODE></DT> @@ -653,16 +655,14 @@ speakers.</P> - +<H4><A NAME="plugins">2.3.2.4 Audio plugins (deprecated)</A></H4> <H2><STRONG>Note: Audio plugins have been deprecated by audio filters and will be removed soon.</STRONG></H2> -<H4><A NAME="plugins">2.3.2.4 Audio plugins (deprecated)</A></H4> - <P>MPlayer has support for audio plugins. Audio plugins can be used to change the properties of the audio data before it reaches the sound - card. They are enabled using the <CODE>-aop</CODE> switch which takes a + card. They are enabled using the <CODE>-aop</CODE> option which takes a <CODE>list=plugin1,plugin2,...</CODE> argument. The <CODE>list</CODE> argument is required and determines which plugins should be used and in which order they should be executed. Example:</P> @@ -672,10 +672,10 @@ <P>would run the sound through the resampling plugin followed by the format plugin.</P> -<P>The plugins can also have switches that change their behavior. These - switches are explained in detail in the sections below. A plugin will execute - using default settings if its switches are omitted. Here is an example of how - to use plugins in combination with plugin specific switches:</P> +<P>The plugins can also have options that change their behavior. These + options are explained in detail in the sections below. A plugin will execute + using default settings if its options are omitted. Here is an example of how + to use plugins in combination with plugin specific options:</P> <P> <CODE>mplayer media.avi -aop list=resample,format:fout=44100:format=0x8</CODE></P> @@ -692,7 +692,7 @@ be used if you have a fixed frequency sound card or if you are stuck with an old sound card that is only capable of max 44.1kHz. MPlayer <EM>autodetects</EM> whether or not usage of this plugin is necessary. - This plugin has one switch, <CODE>fout</CODE>, which is used for setting the + This plugin has one option, <CODE>fout</CODE>, which is used for setting the desired output sample frequency. The value is given in Hz, and defaults to 48kHz.</P> @@ -721,7 +721,7 @@ <P>If your sound card driver does not support signed 16bit <CODE>int</CODE> data type, this plugin can be used to change the format to one which your sound card can understand. It - has one switch, <CODE>format</CODE>, which can be set to one of the numbers + has one option, <CODE>format</CODE>, which can be set to one of the numbers found in <CODE>libao2/afmt.h</CODE>. This plugin is hardly ever needed and is intended for advanced users. Keep in mind that this plugin only changes the sample format and not the sample frequency or the number of channels.</P> @@ -749,7 +749,7 @@ can be used on machines with a broken mixer device. It can also be used if one wants to change the output volume of MPlayer without changing the PCM volume setting in the mixer. It has one - switch <CODE>volume</CODE> that is used for setting the initial + option <CODE>volume</CODE> that is used for setting the initial sound level. The initial sound level can be set to values between 0 and 255 and defaults to 101 which equals 0dB amplification. Use this plugin with caution since it can reduce the signal to noise ratio of diff --git a/DOCS/video.html b/DOCS/video.html index 58f45b596d..a969b3d1ca 100644 --- a/DOCS/video.html +++ b/DOCS/video.html @@ -258,7 +258,7 @@ --enable-dga.</P> <P>If the driver couldn't switch to a smaller resolution, experiment with - switches -vm (only with X 3.3.x), -fs, -bpp, -zoom to find a video mode that + options -vm (only with X 3.3.x), -fs, -bpp, -zoom to find a video mode that the movie fits in. There is no converter right now :(</P> <P>Become root. DGA needs root access to be able to write directly to video @@ -315,7 +315,7 @@ <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 resolution of the video as close as possible. It deliberately ignores the - -vm and -fs switches (enabling of video mode switching and fullscreen) - + -vm and -fs options (enabling of video mode switching and fullscreen) - it always tries to cover as much area of your screen as possible by switching the video mode, thus refraining to use a single additional cycle of your CPU to scale the image. @@ -459,7 +459,7 @@ <P>SDL video output supports displaying subtitles under the movie, on the (if present) black bar.</P> -<P><B>There are several command line switches for SDL:</B></P> +<P><B>There are several command line options for SDL:</B></P> <DL> <DT><CODE>-vo sdl:name</CODE></DT> <DD>specifies sdl video driver to use (i.e.. aalib, dga, x11)</DD> @@ -501,7 +501,7 @@ <H4>Notes</H4> -<P>Be sure not to use the -fs switch, since it toggles the usage of the software +<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> @@ -705,8 +705,8 @@ <P>NOTE: the rendering is very CPU intensive, especially when using AA-on-X (using aalib on X), and it's least CPU intensive on standard, non-framebuffer console. Use SVGATextMode to set up a big textmode, - then enjoy! (secondary head Hercules cards rock :)) (anyone can enhance - fbdev to do conversion/dithering to hgafb? Would be neat :)</P> + then enjoy! (secondary head Hercules cards rock :)) (but imho you can use + <CODE>-vop 1bpp</CODE> option to get graphics on hgafb:)</P> <P>Use the <CODE>-framedrop</CODE> option if your computer isn't fast enough to render all frames!</P> @@ -1041,7 +1041,7 @@ Indeed it doesn't matter which video output driver is used with <B>VIDIX</B>. <CODE>expand=w:h:x:y:1</CODE> (the 5th parameter <CODE>:1</CODE> at the end will enable OSD rendering). You may want to move the image up a bit to get a bigger black zone for subtitles. You may also want to move subtitles up, if - they are outside your TV screen, use the <CODE>-subpos <0-100></CODE> switch + they are outside your TV screen, use the <CODE>-subpos <0-100></CODE> option to adjust this (<CODE>-subpos 80</CODE> is a good choice).</P> <P>In order to play non-25fps movies on a PAL TV or with a slow CPU, add the |