sync with HTML

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9678 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 28 insertions, 28 deletions

diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index 913b0adf99..8ac70f4929 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -519,7 +519,7 @@ The onscreen display (OSD) is flickering!
 </para></question>
 <answer><para>
 You use a vo driver with single buffering (x11,xv). With xv, use the
-<option>-double</option> option. Also try <option>-vop expand</option>.
+<option>-double</option> option. Also try <option>-vf expand</option>.
 </para></answer>
 </qandaentry>
 
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index d7c039b484..dbbfa981ea 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -8,7 +8,7 @@ process of <application>MPlayer</application>. It's not easy, but it won't
 necessarily be hard. If you experience a different behavior than what I
 explain, please search through this documentation and you'll find your
 answers. If you see links, please follow them and read carefully what they
-contain. It will take some time, but it DOES worth it.
+contain. It will take some time, but it IS worth it.
 </para>
 
 <para>
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 8b3fae6e21..b8d2eb5165 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -146,7 +146,7 @@ section.
 
 <para>
 The scaling process is handled by the <literal>scale</literal> video filter:
-<option>-vop scale=<replaceable>width</replaceable>:<replaceable>height</replaceable></option>.
+<option>-vf scale=<replaceable>width</replaceable>:<replaceable>height</replaceable></option>.
 Its quality can be set with the <option>-sws</option> option.
 If it's not specified, <application>MEncoder</application> will use 0: fast
 bilinear.
@@ -155,7 +155,7 @@ bilinear.
 <para>
 Usage:
 <screen>
-mencoder <replaceable>input.mpg</replaceable> -ovc lavc -lavcopts vcodec=mpeg4 -vop scale=640:480-o <replaceable>output.avi</replaceable>
+mencoder <replaceable>input.mpg</replaceable> -ovc lavc -lavcopts vcodec=mpeg4 -vf scale=640:480-o <replaceable>output.avi</replaceable>
 </screen>
 </para>
 </sect1>
@@ -480,7 +480,7 @@ See the manpage about the usage of the <systemitem>cropdetect</systemitem> and
 <formalpara>
 <title>Usage</title>
 <para>
-<screen>mencoder sample-svcd.mpg -ovc lavc -lavcopts vcodec=mpeg4:aspect=16.0/9.0 -vop crop=714:548:0:14 -oac copy -o output.avi</screen>
+<screen>mencoder sample-svcd.mpg -ovc lavc -lavcopts vcodec=mpeg4:aspect=16.0/9.0 -vf crop=714:548:0:14 -oac copy -o output.avi</screen>
 </para>
 </formalpara>
 </sect1>
diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml
index a0b7efd997..e6d070d88d 100644
--- a/DOCS/xml/en/tvinput.xml
+++ b/DOCS/xml/en/tvinput.xml
@@ -58,7 +58,7 @@ deinterlacing on. Otherwise you'll get a movie which is distorted during
 fast-motion scenes and the bitrate controller will be probably even unable
 to retain the specified bitrate as the interlacing artifacts produce high
 amount of detail and thus consume lot of bandwidth. You can enable
-deinterlacing with <option>-vop pp=DEINT_TYPE</option>. Usually
+deinterlacing with <option>-vf pp=DEINT_TYPE</option>. Usually
 <option>pp=lb</option> does a good job, but it can be matter of personal
 preference. See other deinterlacing algorithms in the manual and give it a try.
 </para>
@@ -175,7 +175,7 @@ LAME codec. This setup is suitable for capturing movies.
      mencoder -tv on:driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=900 \
      -oac mp3lame -lameopts cbr:br=64 \
-     -vop pp=lb,crop=720:544:24:16 -o output.avi
+     -vf pp=lb,crop=720:544:24:16 -o output.avi
 </screen>
 </para>
 </informalexample>
@@ -191,7 +191,7 @@ capturing long TV series, where the video quality isn't so important.
      mencoder -tv on:driver=v4l:width=768:height=576 \
      -ovc lavc -lavcopts vcodec=mpeg4:vbitrate=350:vhq:vqmax=31:keyint=300 \
      -oac mp3lame -lameopts cbr:br=48 \
-     -vop scale=384:288,pp=tn/lb,crop=720:540:24:18 -sws 1 -o output.avi 
+     -vf scale=384:288,pp=tn/lb,crop=720:540:24:18 -sws 1 -o output.avi 
 </screen>
 It's also possible to specify smaller image dimensions in the <option>-tv</option>
 option and omit the software scaling but this approach uses the maximum available
diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml
index bf55bc8981..1bd419cf5b 100644
--- a/DOCS/xml/en/video.xml
+++ b/DOCS/xml/en/video.xml
@@ -715,9 +715,9 @@ The bpp (bits per pixel) value must be set to 4 by hand:
 
 <para>
 The movie probably must be scaled down to fit in EGA mode:
-<screen>-vop scale=640:350</screen>
+<screen>-vf scale=640:350</screen>
 or
-<screen>-vop scale=320:200</screen>
+<screen>-vf scale=320:200</screen>
 </para>
 
 <para>
@@ -733,7 +733,7 @@ Maybe automatic aspect correction has to be shut off:
 <note><para>
 according to my experience the best image quality on
 EGA screens can be achieved by decreasing the brightness a bit:
-<option>-vop eq=-20:0</option>. I also needed to lower the audio
+<option>-vf eq=-20:0</option>. I also needed to lower the audio
 samplerate on my box, because the sound was broken on 44kHz:
 <option>-srate 22050</option>.
 </para></note>
@@ -1064,7 +1064,7 @@ 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 :)) (but imho you
-can use -vop 1bpp option to get graphics on hgafb:)
+can use -vf 1bpp option to get graphics on hgafb:)
 </para>
 </note>
 
@@ -1482,7 +1482,7 @@ informations.
 </para>
 
 <para>This video output driver will enable CRTC2 (on the second head) on the
-Matrox G400 card, displaying video <emphasis role="bold">independently</emphasis>
+Matrox G400/G450/G500 card, displaying video <emphasis role="bold">independently</emphasis>
 of the first head.
 </para>
 
@@ -1490,7 +1490,7 @@ of the first head.
 Instructions on how to make it work can be found in the
 <ulink url="../../tech/directfb.txt">tech section</ulink>
 or directly on Ville Syrjala's
-<ulink url="http://www.sci.fi/~syrjala/directfb/readme.txt">home page</ulink>.
+<ulink url="http://www.sci.fi/~syrjala/directfb/Matrox_TV-out_README.txt">home page</ulink>.
 </para>
 
 <note><para>
@@ -1539,37 +1539,37 @@ a command like this:
 </para>
 <para><screen>
 mplayer -ao mpegpes -vo mpegpes yourfile.ext
-mplayer -ao mpegpes -vo mpegpes -vop expand yourfile.ext
+mplayer -ao mpegpes -vo mpegpes -vf expand yourfile.ext
 </screen></para>
 
 <para>
 Note that DVB cards only support heights 288 and 576 for PAL or 240 and 480 for
 NTSC. You <emphasis role="bold">must</emphasis> escale for other heights by adding
 <option>scale=width:height</option> with the width and height you want to the
-<option>-vop</option> option. DVB cards accept various widths, like 720, 704,
+<option>-vf</option> option. DVB cards accept various widths, like 720, 704,
 640, 512, 480, 352 etc and do hardware scaling in horizontal direction, so you
 do not need to scale horizontally in most cases. For a 512x384 (aspect 4:3)
 DivX try:
 </para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vop scale=512:576</screen></para>
+<para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=512:576</screen></para>
 
 <para>If you have a widescreen movie and you do not want to scale it to full height,
 you can use the <option>expand=w:h</option> filter to add black bands. To view a
 640x384 DivX, try:
 </para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vop expand=640:576 file.avi
+<para><screen>mplayer -ao mpegpes -vo mpegpes -vf expand=640:576 file.avi
 </screen></para>
 
 <para>If your CPU is too slow for a full size 720x576 DivX, try downscaling:</para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vop scale=352:576 file.avi
+<para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 file.avi
 </screen></para>
 
 <para>If speed does not improve, try vertical downscaling, too:</para>
 
-<para><screen>mplayer -ao mpegpes -vo mpegpes -vop scale=352:288 file.avi
+<para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:288 file.avi
 </screen></para>
 
 <para>
@@ -1594,8 +1594,8 @@ while keeping the right aspect ratio), use the new dvbscale filter:
 </para>
 
 <para><screen>
-for  3:4 TV: -vop expand=-1:576:-1:-1:1,scale=-1:0,dvbscale
-for 16:9 TV: -vop expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024
+for  3:4 TV: -vf expand=-1:576:-1:-1:1,scale=-1:0,dvbscale
+for 16:9 TV: -vf expand=-1:576:-1:-1:1,scale=-1:0,dvbscale=1024
 </screen></para>
 
 <formalpara>
@@ -1735,16 +1735,16 @@ This does not work with digital audio output (<option>-ac hwac3</option>).
 </varlistentry>
 
 <varlistentry>
-<term><option>-vop lavc/fame</option></term>
+<term><option>-vf lavc/fame</option></term>
 <listitem><para>
 To watch non-MPEG content on the em8300 (i.e. DivX or RealVideo) you have to
 specify an MPEG1 video filter such as libavcodec (lavc) or libfame (fame). At
 the moment lavc is both faster and gives better image quality, it is suggested
 that you use that unless you have problems with it. See the man page for further
-info about <option>-vop lavc/fame</option>.
+info about <option>-vf lavc/fame</option>.
 Using lavc is highly recommended. Currently there is no way of setting the fps
 of the em8300 which means that it is fixed to 29.97fps. Because of this it is
-highly recommended that you use <option>-vop lavc=&lt;quality&gt;:25</option>
+highly recommended that you use <option>-vf lavc=&lt;quality&gt;:25</option>
 especially if you are using prebuffering. Then why 25 and not 29.97? Well, the
 thing is that when you use 29.97 the picture becomes a bit jumpy. The reason for
 this is unknown to us. If you set it to somewhere between 25 and 27 the picture
@@ -1753,7 +1753,7 @@ becomes stable. For now all we can do is accept this for a fact.
 </varlistentry>
 
 <varlistentry>
-<term><option>-vop expand=-1:-1:-1:-1:1</option></term>
+<term><option>-vf expand=-1:-1:-1:-1:1</option></term>
 <listitem><para>
 Although the DXR3 driver can put some OSD onto the MPEG1/2/4 video, it has
 much lower quality than MPlayer's traditional OSD, and has several refresh
@@ -1819,7 +1819,7 @@ fullscreen on your DC10+. There are three main possibilities, you may scale
 the movie to a width of 768, 384 or 192. For performance and quality reasons,
 I would choose to scale the movie to 384x204 using the fast bilinear software
 scaler. The commandline is
-<screen>mplayer -vo zr -sws 0 -vop scale=384:204 movie.avi</screen>
+<screen>mplayer -vo zr -sws 0 -vf scale=384:204 movie.avi</screen>
 </para>
 
 <para>
@@ -1832,7 +1832,7 @@ the you would issue the following command
 
 <para>
 if you want to use the <systemitem>crop</systemitem> filter, you would do
-<screen>mplayer -vo zr -vop crop=720:320:80:0 benhur.avi</screen>
+<screen>mplayer -vo zr -vf crop=720:320:80:0 benhur.avi</screen>
 </para>
 
 <para>