Mercurial > mplayer.hg
changeset 21596:f551403d82a9
replace " with ", better readability
| author | torinthiel |
|---|---|
| date | Thu, 14 Dec 2006 13:49:57 +0000 |
| parents | 5815f5c6d370 |
| children | 9a47f5a440f9 |
| files | DOCS/xml/en/bugreports.xml DOCS/xml/en/cd-dvd.xml DOCS/xml/en/codecs.xml DOCS/xml/en/containers.xml DOCS/xml/en/encoding-guide.xml DOCS/xml/en/mencoder.xml DOCS/xml/en/ports.xml DOCS/xml/en/radio.xml DOCS/xml/en/skin.xml DOCS/xml/en/tvinput.xml DOCS/xml/en/usage.xml DOCS/xml/en/video.xml |
| diffstat | 12 files changed, 50 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/xml/en/bugreports.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/bugreports.xml Thu Dec 14 13:49:57 2006 +0000 @@ -286,7 +286,7 @@ <itemizedlist> <listitem><para> X colour depth: - <screen>xdpyinfo | grep "depth of root"</screen> + <screen>xdpyinfo | grep "depth of root"</screen> </para></listitem> </itemizedlist> </para></listitem>
--- a/DOCS/xml/en/cd-dvd.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/cd-dvd.xml Thu Dec 14 13:49:57 2006 +0000 @@ -63,7 +63,7 @@ <para> Please refer to -"<filename>/proc/ide/<replaceable>[cdrom device]</replaceable>/settings</filename>" +"<filename>/proc/ide/<replaceable>[cdrom device]</replaceable>/settings</filename>" for fine-tuning your CD-ROM. </para>
--- a/DOCS/xml/en/codecs.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/codecs.xml Thu Dec 14 13:49:57 2006 +0000 @@ -598,7 +598,7 @@ </para> <note><para>On Windows NT/2000/XP search for this info in the registry, -e.g. search for "VIDC.HFYU". To find out how to do this, look at +e.g. search for "VIDC.HFYU". To find out how to do this, look at the old DirectShow method below. </para></note> </sect2>
--- a/DOCS/xml/en/containers.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/containers.xml Thu Dec 14 13:49:57 2006 +0000 @@ -336,7 +336,7 @@ <para> <ulink url="ftp://ftp.rfc-editor.org/in-notes/rfc2327.txt">SDP</ulink> is an IETF standard format for describing video and/or audio RTP streams. -(The "<ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>" +(The "<ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>" are required.) </para> </sect2>
--- a/DOCS/xml/en/encoding-guide.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/encoding-guide.xml Thu Dec 14 13:49:57 2006 +0000 @@ -4,14 +4,14 @@ <title>Encoding with <application>MEncoder</application></title> <sect1 id="menc-feat-dvd-mpeg4"> -<title>Making a high quality MPEG-4 ("DivX") +<title>Making a high quality MPEG-4 ("DivX") rip of a DVD movie</title> <para> -One frequently asked question is "How do I make the highest quality rip -for a given size?". Another question is "How do I make the highest +One frequently asked question is "How do I make the highest quality rip +for a given size?". Another question is "How do I make the highest quality DVD rip possible? I do not care about file size, I just want the best -quality." +quality." </para> <para> @@ -1930,7 +1930,7 @@ demux_mpg: 24000/1001 fps progressive NTSC content detected, switching framerate. </screen> From this point forward, demux_mpg should never say it finds -"30000/1001 fps NTSC content." +"30000/1001 fps NTSC content." </para> <para> @@ -1953,7 +1953,7 @@ <para> Sometimes progressive video on DVDs is referred to as -"soft-telecine" because it is intended to +"soft-telecine" because it is intended to be telecined by the DVD player. </para> </sect3> @@ -1974,7 +1974,7 @@ <para> Watching a telecined video, you will see interlacing artifacts that -seem to "blink": they repeatedly appear and disappear. +seem to "blink": they repeatedly appear and disappear. You can look closely at this by <orderedlist> <listitem><screen>mplayer dvd://1</screen></listitem> @@ -1998,7 +1998,7 @@ <para> Sometimes telecined video on DVDs is referred to as -"hard-telecine". Since hard-telecine is already 60000/1001 fields +"hard-telecine". Since hard-telecine is already 60000/1001 fields per second, the DVD player plays the video without any manipulation. </para> @@ -2023,7 +2023,7 @@ <para> Interlaced video was originally filmed at 60000/1001 fields per second, and stored on the DVD as 30000/1001 frames per second. The interlacing effect -(often called "combing") is a result of combining pairs of +(often called "combing") is a result of combining pairs of fields into frames. Each field is supposed to be 1/(60000/1001) seconds apart, and when they are displayed simultaneously the difference is apparent. </para> @@ -2044,19 +2044,19 @@ <title>Mixed progressive and telecine</title> <para> -All of a "mixed progressive and telecine" video was originally +All of a "mixed progressive and telecine" video was originally 24000/1001 frames per second, but some parts of it ended up being telecined. </para> <para> When <application>MPlayer</application> plays this category, it will -(often repeatedly) switch back and forth between "30000/1001 fps NTSC" -and "24000/1001 fps progressive NTSC". Watch the bottom of +(often repeatedly) switch back and forth between "30000/1001 fps NTSC" +and "24000/1001 fps progressive NTSC". Watch the bottom of <application>MPlayer</application>'s output to see these messages. </para> <para> -You should check the "30000/1001 fps NTSC" sections to make sure +You should check the "30000/1001 fps NTSC" sections to make sure they are actually telecine, and not just interlaced. </para> </sect3> @@ -2066,12 +2066,12 @@ <title>Mixed progressive and interlaced</title> <para> -In "mixed progressive and interlaced" content, progressive +In "mixed progressive and interlaced" content, progressive and interlaced video have been spliced together. </para> <para> -This category looks just like "mixed progressive and telecine", +This category looks just like "mixed progressive and telecine", until you examine the 30000/1001 fps sections and see that they do not have the telecine pattern. </para> @@ -2134,7 +2134,7 @@ For most practical cases it is not possible to retrieve a complete progressive video from interlaced content. The only way to do so without losing half of the vertical resolution is to double the -framerate and try to "guess" what ought to make up the +framerate and try to "guess" what ought to make up the corresponding lines for each field (this has drawbacks - see method 3). </para> @@ -2156,7 +2156,7 @@ these filters available to choose from, each with its own advantages and disadvantages. Consult <option>mplayer -pphelp</option> and <option>mplayer -vf help</option> to see what is available - (grep for "deint"), read Michael's Niedermayer + (grep for "deint"), read Michael's Niedermayer <ulink url="http://guru.multimedia.cx/deinterlacing-filters/">Deinterlacing filters comparison</ulink>, and search the <ulink url="http://www.mplayerhq.hu/design7/mailing_lists.html"> @@ -2236,7 +2236,7 @@ else <application>MEncoder</application> will crash. <option>pullup</option> is, however, the cleanest and most accurate method available for encoding both telecine and - "mixed progressive and telecine". + "mixed progressive and telecine". <screen> mencoder dvd://1 -oac copy -vf pullup,softskip -ovc lavc -ofps 24000/1001<!-- @@ -2297,7 +2297,7 @@ second video, they will be telecined along with the progressive frames. Half of the interlaced "frames" will be displayed for three fields' duration (3/(60000/1001) seconds), resulting in a flicking - "jump back in time" effect that looks quite bad. If you + "jump back in time" effect that looks quite bad. If you even attempt this, you <emphasis role="bold">must</emphasis> use a deinterlacing filter like <option>lb</option> or <option>l5</option>. @@ -2342,7 +2342,7 @@ <title>About cropping:</title> <para> Video data on DVDs are stored in a format called YUV 4:2:0. In YUV - video, luma ("brightness") and chroma ("color") + video, luma ("brightness") and chroma ("color") are stored separately. Because the human eye is somewhat less sensitive to color than it is to brightness, in a YUV 4:2:0 picture there is only one chroma pixel for every four luma pixels. In a @@ -2824,7 +2824,7 @@ </para> <para> -The <emphasis role="bold">KVCD "Notch" Quantization Matrix:</emphasis> +The <emphasis role="bold">KVCD "Notch" Quantization Matrix:</emphasis> </para> <para> @@ -3597,10 +3597,10 @@ you only have to decide whether you think the quality differences justify the speed differences. For the second class of options, preferences may be far more subjective, and more factors may be -involved. Note that some of the "personal preferences and special -requirements" options can still have large impacts on speed or quality, +involved. Note that some of the "personal preferences and special +requirements" options can still have large impacts on speed or quality, but that is not what they are primarily useful for. A couple of the -"personal preference" options may even cause changes that look better +"personal preference" options may even cause changes that look better to some people, but look worse to others. </para>
--- a/DOCS/xml/en/mencoder.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/mencoder.xml Thu Dec 14 13:49:57 2006 +0000 @@ -315,7 +315,7 @@ <sect1 id="menc-feat-mpeg4"> -<title>Encoding two pass MPEG-4 ("DivX")</title> +<title>Encoding two pass MPEG-4 ("DivX")</title> <para> The name comes from the fact that this method encodes the file @@ -333,7 +333,7 @@ <example id="copy_audio_track"> <title>copy audio track</title> <para> -Two pass encode of the second track a DVD to an MPEG-4 ("DivX") +Two pass encode of the second track a DVD to an MPEG-4 ("DivX") AVI while copying the audio track. <screen> mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o /dev/null @@ -346,7 +346,7 @@ <example id="encode_audio_track"> <title>encode audio track</title> <para> -Two pass encode of a DVD to an MPEG-4 ("DivX") AVI while encoding +Two pass encode of a DVD to an MPEG-4 ("DivX") AVI while encoding the audio track to MP3. Be careful using this method as it may lead to audio/video desync in some cases.
--- a/DOCS/xml/en/ports.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/ports.xml Thu Dec 14 13:49:57 2006 +0000 @@ -124,7 +124,7 @@ <para> To use Win32 DLLs with <application>MPlayer</application> you will need to -re-compile the kernel with "<envar>option USER_LDT</envar>" +re-compile the kernel with "<envar>option USER_LDT</envar>" (unless you run FreeBSD-CURRENT, where this is the default). </para> @@ -136,7 +136,7 @@ <para> If your CPU has SSE, recompile your kernel with -"<envar>options CPU_ENABLE_SSE</envar>" (FreeBSD-STABLE or kernel +"<envar>options CPU_ENABLE_SSE</envar>" (FreeBSD-STABLE or kernel patches required). </para> </sect2> @@ -249,7 +249,7 @@ <para> The <filename>configure</filename> script tries to find out, which assembler -program is used by your "gcc" command (in case the autodetection +program is used by your "gcc" command (in case the autodetection fails, use the <option>--as=<replaceable>/wherever/you/have/installed/gnu-as</replaceable></option> option to tell the <filename>configure</filename> script where it can find GNU
--- a/DOCS/xml/en/radio.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/radio.xml Thu Dec 14 13:49:57 2006 +0000 @@ -45,7 +45,7 @@ Explanation: With this option, only the 104.4 and 103.9 radio stations will be usable. There will be a nice OSD text upon channel switching, displaying the channel's name. Spaces in the channel name must be - replaced by the "_" character. + replaced by the "_" character. </para></listitem> <listitem><para> There are several ways of capturing audio. You can grab the sound either using
--- a/DOCS/xml/en/skin.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/skin.xml Thu Dec 14 13:49:57 2006 +0000 @@ -501,21 +501,21 @@ <varlistentry> <term><literal> - <anchor id="skin-slabel"/>slabel = X, Y, fontid, "text" + <anchor id="skin-slabel"/>slabel = X, Y, fontid, "text" </literal></term> <listitem><para> Place a static label at the position <literal>X,Y</literal>. <literal>text</literal> is displayed using the font identified by <literal>fontid</literal>. The text is just a raw string (<literal>$x</literal> variables do not work) that must be enclosed between - double quotes (but the " character cannot be part of the text). The + double quotes (but the " character cannot be part of the text). The label is displayed using the font identified by <literal>fontid</literal>. </para></listitem> </varlistentry> <varlistentry> <term><literal> - <anchor id="skin-dlabel"/>dlabel = X, Y, length, align, fontid, "text" + <anchor id="skin-dlabel"/>dlabel = X, Y, length, align, fontid, "text" </literal></term> <listitem> <para> @@ -530,7 +530,7 @@ </para> <para> The text to be displayed is given by <literal>text</literal>: It must be - written between double quotes (but the " character cannot be part of the + written between double quotes (but the " character cannot be part of the text). The label is displayed using the font identified by <literal>fontid</literal>. You can use the following variables in the text: </para> @@ -780,7 +780,7 @@ Where <literal><replaceable>image</replaceable></literal> is the name of the image file to be used for the font (you do not have to specify the extension). <anchor id="skin-font-char"/> -<programlisting>"char" = X, Y, width, height</programlisting> +<programlisting>"char" = X, Y, width, height</programlisting> Here <literal>X</literal> and <literal>Y</literal> specify the position of the <literal>char</literal> character in the image (<literal>0,0</literal> is the upper left corner). <literal>width</literal> and <literal>height</literal> are @@ -790,13 +790,13 @@ <para> This example defines the A, B, C characters using <filename>font.png</filename>. <programlisting> -; Can be "font" instead of "font.png". +; Can be "font" instead of "font.png". image = font.png ; Three characters are enough for demonstration purposes :-) -"A" = 0,0, 7,13 -"B" = 7,0, 7,13 -"C" = 14,0, 7,13 +"A" = 0,0, 7,13 +"B" = 7,0, 7,13 +"C" = 14,0, 7,13 </programlisting> </para>
--- a/DOCS/xml/en/tvinput.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/tvinput.xml Thu Dec 14 13:49:57 2006 +0000 @@ -48,7 +48,7 @@ Explanation: using this option, only the 26 and 23 channels will be usable, and there will be a nice OSD text upon channel switching, displaying the channel's name. Spaces in the channel name must be replaced by the - "_" character. + "_" character. </para></listitem> <listitem><para> Choose some sane image dimensions. The dimensions of the resulting image
--- a/DOCS/xml/en/usage.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/usage.xml Thu Dec 14 13:49:57 2006 +0000 @@ -304,7 +304,7 @@ <para> If you have the LIRC package installed, <filename>configure</filename> will autodetect it. If everything went fine, <application>MPlayer</application> -will print "<systemitem>Setting up LIRC support...</systemitem>" +will print "<systemitem>Setting up LIRC support...</systemitem>" on startup. If an error occurs it will tell you. If there is no message about LIRC there is no support compiled in. That's it :-) </para>
--- a/DOCS/xml/en/video.xml Wed Dec 13 23:24:29 2006 +0000 +++ b/DOCS/xml/en/video.xml Thu Dec 14 13:49:57 2006 +0000 @@ -1605,17 +1605,17 @@ <title>DirectFB</title> <blockquote><para> -"DirectFB is a graphics library which was designed with embedded systems +"DirectFB is a graphics library which was designed with embedded systems in mind. It offers maximum hardware accelerated performance at a minimum -of resource usage and overhead." - quoted from +of resource usage and overhead." - quoted from <ulink url="http://www.directfb.org"/> </para></blockquote> <para>I'll exclude DirectFB features from this section.</para> <para> -Though <application>MPlayer</application> is not supported as a "video -provider" in DirectFB, this output driver will enable video playback +Though <application>MPlayer</application> is not supported as a "video +provider" in DirectFB, this output driver will enable video playback through DirectFB. It will - of course - be accelerated, on my Matrox G400 DirectFB's speed was the same as XVideo. </para>