vop -> vf change, small fixes. The Polish documentation should be checked for correctness.

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

1 files changed, 18 insertions, 18 deletions

diff --git a/DOCS/zh/video.html b/DOCS/zh/video.html
index 2f5f41924d..d9d1e2930f 100644
--- a/DOCS/zh/video.html
+++ b/DOCS/zh/video.html
@@ -376,13 +376,13 @@
 <P>bpp(ÿÏóËرÈÌØÊý)µÄÖµ±ØÐëÊÖ¹¤ÉèΪ4£º<BR>
   &nbsp; &nbsp; <CODE>-bpp 4</CODE><BR>
   µçÓ°¿ÉÄܱØÐë±»°´±ÈÀýËõСµ½EGAÊʺϵÄģʽ£º<BR>
-  &nbsp; &nbsp;<CODE>-vop scale=640:350</CODE>»òÕß<BR>
-  &nbsp; &nbsp;<CODE>-vop scale=320:200</CODE><BR>
+  &nbsp; &nbsp;<CODE>-vf scale=640:350</CODE>»òÕß<BR>
+  &nbsp; &nbsp;<CODE>-vf scale=320:200</CODE><BR>
   Ϊ×öµ½ÕâÒ»µãÎÒÃÇÐèҪʹÓÿìËÙµ«µÍÖÊÁ¿µÄÀý³Ì£º<BR>
   &nbsp; &nbsp;<CODE>-sws 4</CODE><BR>
   Ò²Ðí×Ô¶¯¾ÀÕý³¤¿í±ÈµÄ¹¦ÄÜÐèÒª¹Ø±Õ£º<BR>
   &nbsp; &nbsp;<CODE>-noaspect</CODE></P>
-<P><B>×¢Ò⣺</B>¸ù¾ÝÎҵľ­ÑéÓÃ<CODE>-vop eq=-20:0</CODE>ÉÔÉÔ½µµÍÁÁ¶È¿ÉÒÔÔÚEGAÆÁÄ»ÉÏ»ñµÃ×îºÃµÄͼÏóÖÊÁ¿¡£ÔÚÎÒµÄ
+<P><B>×¢Ò⣺</B>¸ù¾ÝÎҵľ­ÑéÓÃ<CODE>-vf eq=-20:0</CODE>ÉÔÉÔ½µµÍÁÁ¶È¿ÉÒÔÔÚEGAÆÁÄ»ÉÏ»ñµÃ×îºÃµÄͼÏóÖÊÁ¿¡£ÔÚÎÒµÄ
 »úÆ÷ÉÏÎÒÒ²Òª½µµÍÒôƵ²ÉÑùÂÊ£¬ÒòΪÉùÒôÔÚ44kHzʱºÜ²î£º<CODE>-srate 22050</CODE>.</P>
 
 <P>ÄãÖ»Óдò¿ª<CODE>expand</CODE>Â˾µ²ÅÄÜʹÓÃOSDºÍ×ÖÄ»¡£¾ßÌå²ÎÊý²Î¼ûman page¡£</P>
@@ -526,7 +526,7 @@ MPlayer°üº¬Ò»¸öÕë¶ÔËüµÄʵÓõÄÇý¶¯¡£Èç¹û./configure·¢ÏÖ°²×°ÁËaalib£¬aalibµÄlibvoÇ
 </DL>
 
 <P>×¢Ò⣺äÖȾЧ¹ûÊÇÊ®·ÖÏûºÄCPUµÄ£¬ÌرðÊÇʹÓÃAA-on-X(ÔÚXÉÏʹÓÃaalib)£¬ÔÚ±ê×¼µÄ·ÇÖ¡»º³å¿ØÖÆ̨ÉϵÄCPUÏûºÄÊÇ×îСµÄ£¬
-ÓÃSVGATextModeÉèÖÃÒ»¸ö´óµÄÎı¾Ä£Ê½£¬È»ºóÔÙÐÀÉ͵çÓ°£¡(´óÁ¦ÉñÏÔ¿¨µÄµÚ¶þ¸ö½Ó¿Ú¾Í²»´í:))(µ«ÎÒ½¨ÒéÄãÓÃ<CODE>-vop
+ÓÃSVGATextModeÉèÖÃÒ»¸ö´óµÄÎı¾Ä£Ê½£¬È»ºóÔÙÐÀÉ͵çÓ°£¡(´óÁ¦ÉñÏÔ¿¨µÄµÚ¶þ¸ö½Ó¿Ú¾Í²»´í:))(µ«ÎÒ½¨ÒéÄãÓÃ<CODE>-vf
  1bpp</CODE>Ñ¡ÏîÔÚhgafbÉÏ»ñµÃͼÏó;)</P>
 
 <P>Èç¹ûÄãµÄ¼ÆËã»úËٶȲ»×ãÒÔäÖȾËùÓÐÖ¡¾ÍʹÓÃ<CODE>-framedrop</CODE>Ñ¡Ïî</P>
@@ -771,35 +771,35 @@ HREF="http://www.sci.fi/~syrjala/directfb/Matrox_TV-out_README.txt">Ö÷Ò³</A>»ñµÃ
 
 <PRE>
   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
 </PRE>
 
 <P>×¢Òâµ½£¬DVBÏÔ¿¨Ö»Ö§³Ö¸ß¶ÈΪ288»ò576µÄPAL¸ñʽ»òÕß240»ò480µÄNTSC¸ñʽ¡£Äã<B>±ØÐë</B>¶ÔÆäËüµÄ¸ß¶È½øÐÐÖØÐÂËõ·Å£¬
-ͨ¹ýÔÚ<CODE>-vop</CODE>Ñ¡ÏîÖÐʹÓÃ<CODE>scale=width:height</CODE>Ö¸¶¨ÄãÏëÒª¿í¶ÈºÍ¸ß¶È¡£DVBÏÔ¿¨¿ÉÒÔ½ÓÊܶàÖÖ¿í¶È£¬
+ͨ¹ýÔÚ<CODE>-vf</CODE>Ñ¡ÏîÖÐʹÓÃ<CODE>scale=width:height</CODE>Ö¸¶¨ÄãÏëÒª¿í¶ÈºÍ¸ß¶È¡£DVBÏÔ¿¨¿ÉÒÔ½ÓÊܶàÖÖ¿í¶È£¬
 Ïñ720£¬704£¬640£¬512£¬480£¬352µÈµÈ£¬¶øÇÒÔÚˮƽ·½ÏòÉÏ¿ÉÒÔÓ²¼þËõ·Å£¬ËùÒÔ´ó¶àÊýÇé¿öÏÂÄã²»ÐèÒª×÷ˮƽËõ·Å¡£
 ÀýÈç¶ÔÓÚ512x384(¿í¸ß±È4:3)µÄDivXʹÓÃÏÂÁÐÃüÁ</P>
 
 <PRE>
-  mplayer -ao mpegpes -vo mpegpes -vop scale=512:576
+  mplayer -ao mpegpes -vo mpegpes -vf scale=512:576
 </PRE>
 
 <P>Èç¹ûÄãʹÓÿíÒøÄ»µçÓ°¶øÄã°ÑËü·Å´óµ½Õû¸öÆÁÄ»µÄ¸ß¶È£¬Äã¿ÉÒÔʹÓÃ<CODE>expand=w:h</CODE>²å¼þÀ´Ôö¼ÓºÚ´ø¡£
 ΪÁË¿´640x384·Ö±æÂʵÄDivX£¬Ê¹ÓÃÏÂÁÐÃüÁ</P>
 
 <PRE>
-  mplayer -ao mpegpes -vo mpegpes -vop expand=640:576 file.avi
+  mplayer -ao mpegpes -vo mpegpes -vf expand=640:576 file.avi
 </PRE>
 
 <P>Èç¹ûÄãµÄCPU¶ÔÓÚ²¥·Å720x576µÄDivXÌ«Âý£¬³¢ÊÔºáÏòËõ·Å£º</P>
 
 <PRE>
-  mplayer -ao mpegpes -vo mpegpes -vop lavc,scale=352:576 file.avi
+  mplayer -ao mpegpes -vo mpegpes -vf scale=352:576,lavc file.avi
 </PRE>
 
 <P>Èç¹ûËÙ¶ÈûÓÐÌá¸ß£¬³¢ÊÔÊúÖ±Ëõ·Å£º</P>
 
 <PRE>
-  mplayer -ao mpegpes -vo mpegpes -vop lavc,scale=352:288 file.avi
+  mplayer -ao mpegpes -vo mpegpes -vf scale=352:288,lavc file.avi
 </PRE>
 
 <P>ÒòΪOSDºÍ×ÖĻʹÓÃOSD²å¼þµÄÀ©Õ¹ÌØÐÔ¡£Òò´Ë£¬²»ÒªÊ¹ÓÃ<CODE>expand=w:h</CODE>»òÕß<CODE>expand=w:h:x:y</CODE>£¬
@@ -812,8 +812,8 @@ HREF="http://www.sci.fi/~syrjala/directfb/Matrox_TV-out_README.txt">Ö÷Ò³</A>»ñµÃ
 <P>ΪÁ˱£³ÖDivXÎļþµÄ¿í¸ß±È²¢»ñµÃ×îÀíÏëµÄËõ·Å²ÎÊý(Ó²¼þˮƽËõ·ÅºÍÈí¼þ´¹Ö±Ëõ·Å²¢ÇÒ±£³ÖÕýÈ·¿í¸ß±È)£¬Ê¹ÓÃ×îеÄdvbscale²å¼þ£º</P>
 
 <PRE>
-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 dvbscale,scale=-1:0,expand=-1:576:-1:-1:1
+for 16:9 TV: -vf dvbscale=1024,scale=-1:0,expand=-1:576:-1:-1:1
 </PRE>
 
 <H4>½«À´</H4>
@@ -889,15 +889,15 @@ norm = 0(ĬÈϵÄ)²»¸Ä±äÏÖÔÚµÄÖÆʽ¡£<BR>
 ÀýÈç¶ÔʹÓÃ22050HzµÄµçÓ°£¬ÒòΪ44100Hz/2 = 22050£¬ËùÒÔʹÓÃ44100Hz£¬Èç¹ûÊÇ24000Hz¾ÍʹÓÃ48000Hz£¬ÒòΪ48000Hz/2 = 24000Èç´ËµÈµÈ¡£
 Õâ¶ÔÓÚÊý×ÖÒôƵÊä³ö²»Æð×÷ÓÃ(<CODE>-ac hwac3</CODE>)¡£</DD>
 
-  <DT><CODE>-vop lace/fame</CODE></DT>
+  <DT><CODE>-vf lace/fame</CODE></DT>
   <DD><B>(×Ô¶¯²åÈë)</B>ÒªÔÚem8300ÉϹۿ´·ÇMPEGµÄÄÚÈÝ(ÀýÈçDivX»òÕßRealVideo)Äã±ØÐëÉèÖÃÒ»¸ölibavcodec(lavc)»òÕßlibfame(fame)Ö®ÀàµÄMPEG1ÊÓƵÂ˾µ
-Ä¿Ç°lavcÓиüºÃµÄËٶȻ¹Óиü¸ßµÄͼÏñÖÊÁ¿£¬³ý·ÇÄãʹÓÃʱÓöµ½ÎÊÌ⣬½¨ÒéÄãʹÓÃËû¡£<CODE>-vop lavc/fame</CODE>µÄ½øÒ»²½µÄÐÅÏ¢¿ÉÒÔ
+Ä¿Ç°lavcÓиüºÃµÄËٶȻ¹Óиü¸ßµÄͼÏñÖÊÁ¿£¬³ý·ÇÄãʹÓÃʱÓöµ½ÎÊÌ⣬½¨ÒéÄãʹÓÃËû¡£<CODE>-vf lavc/fame</CODE>µÄ½øÒ»²½µÄÐÅÏ¢¿ÉÒÔ
 ²Î¿¼man page¡£<BR>
-    Ç¿ÁÒÍƼöʹÓÃlavc¡£Ä¿Ç°Ã»Óа취ÉèÖÃem8300µÄfps£¬Õâ±íʾËü½«¹Ì¶¨ÔÚ29.97fps¡£ÒòΪÕâ¸öÇ¿ÁÒÍƼöÄãʹÓÃ<CODE>-vop
+    Ç¿ÁÒÍƼöʹÓÃlavc¡£Ä¿Ç°Ã»Óа취ÉèÖÃem8300µÄfps£¬Õâ±íʾËü½«¹Ì¶¨ÔÚ29.97fps¡£ÒòΪÕâ¸öÇ¿ÁÒÍƼöÄãʹÓÃ<CODE>-vf
 lavc=&lt;quality&gt;:25</CODE>£¬ÌرðÊǵ±ÄãʹÓÃprebufferingµÄʱºò¡£ÄÇôΪʲôÊÇ25¶ø²»ÊÇ29.97£¿àÅ£¬Ô­ÒòÊǵ±Ê¹ÓÃ29.97
 µÄʱºòͼÏñÓÐһЩÌøÔ¾¡£Ä¿Ç°ÎÒÃÇ»¹²»ÖªµÀÔ­Òò¡£Èç¹ûÄã°ÑËüÉèÖóÉ25µ½27Ö®¼äµÄÖµÊÇͼÏñ¾ÍÎȶ¨ÁË¡£Ä¿Ç°ÎÒÃÇÄÜ×öµÄ¾ÍÊǽÓÊÜÕâ¸öÊÂʵ¡£</DD>
 
-  <DT><CODE>-vop expand=-1:-1:-1:-1:1</CODE></DT>
+  <DT><CODE>-vf expand=-1:-1:-1:-1:1</CODE></DT>
   <DD>¾¡¹ÜDXR3µÄÇý¶¯ÄÜ°ÑһЩOSD·Åµ½MPEG1/2/4µÄÊÓƵÉÏ£¬Ëü±ÈMPlayerµÄ´«Í³µÄOSDµÄÖÊÁ¿²îµÄ¶à£¬²¢ÇÒ»¹ÓÐһЩˢеÄÎÊÌâ¡£
 ÉÏÃæµÄÃüÁîÐн«ÏÈ°ÑÊäÈëµÄÊÓƵת»»³ÉMPEG4(ÕâÊDZØÐëµÄ£¬¶Ô²»Æð)£¬È»ºóʹÓÃÒ»¸öÀ©Õ¹Â˾µ£¬²»½øÐÐÈκÎËõ·Å(-1£ºÄ¬ÈÏÖµ)£¬Ö»ÊÇ°ÑÕý³£µÄOSD
 ·Åµ½Í¼ÏñÉÏ(×îºóµÄÄǸö"1"µÄ×÷ÓÃ)¡£</DD>
@@ -938,7 +938,7 @@ lavc=&lt;quality&gt;:25</CODE>£¬ÌرðÊǵ±ÄãʹÓÃprebufferingµÄʱºò¡£ÄÇôΪʲôÊÇ25
 ÃüÁîÐÐÊÇÕâÑùµÄ</P>
 
 <PRE>
-  mplayer -vo zr -sws 0 -vop scale=384:204 movie.avi
+  mplayer -vo zr -sws 0 -vf scale=384:204 movie.avi
 </PRE>
 
 <P>»­ÃæµÄÇиî¿ÉÒÔÓÃ<CODE>crop</CODE>Â˾µÒ²¿ÉÒÔÓÃÇý¶¯×Ô¼ºÍê³É¡£¼ÙÉèµçÓ°Ì«¿íÁË£¬ÔÚÄãµÄ»úÆ÷ÉÏÏÔʾ²»ÁË£¬ÄÇôÄã»áÏëÒªÓÃ
@@ -951,7 +951,7 @@ lavc=&lt;quality&gt;:25</CODE>£¬ÌرðÊǵ±ÄãʹÓÃprebufferingµÄʱºò¡£ÄÇôΪʲôÊÇ25
   Èç¹ûÄãÏëҪʹÓÃ<CODE>crop</CODE>Â˾µ£¬Äã¿ÉÒÔÔËÐÐ
 
 <PRE>
-  mplayer -vo zr -vop crop=720:320:80:0 benhur.avi
+  mplayer -vo zr -vf crop=720:320:80:0 benhur.avi
 </PRE>
 
 <P>¶à¸ö<CODE>-zrcrop</CODE>¾Í»áµ÷ÓÃ<I>cinerama</I>ģʽ£¬Äã¿ÉÒ԰ѵçӰͶÉäµ½¼¸¸öµçÊÓ»òÕßͶӰÒÇÉÏÀ´ÖÆÔìÒ»¸ö´óÒøÄ»£¬ÉèÏëÄãÓÐ