Mercurial > mplayer.hg

changeset 11261:835822ce4bb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-vop ---> -vf
author diego
date Sat, 25 Oct 2003 18:44:41 +0000
parents 1c269ab5f3f6
children 7c0bbcaa8b82
files AUTHORS DOCS/it/video.html DOCS/xml/fr/install.xml DOCS/xml/fr/tvinput.xml DOCS/xml/fr/video.xml DOCS/xml/ru/install.xml TOOLS/benchmark-gab/benchmark TOOLS/mencvcd TOOLS/sws-test cfg-common.h cfg-mencoder.h etc/codecs.conf help/help_mp-fr.h libmpcodecs/vd.c libmpcodecs/ve_libdv.c libmpcodecs/vf_cropdetect.c libmpcodecs/vf_rectangle.c libvo/vo_tdfxfb.c m_option.c
diffstat 19 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Sat Oct 25 12:42:24 2003 +0000
+++ b/AUTHORS	Sat Oct 25 18:44:41 2003 +0000
@@ -345,7 +345,7 @@
     * rawdv demuxer fixes
 
 Hampa Hug <hhug@student.ethz.ch>
-    * LUT-based soft eq video filter (-vop eq2)
+    * LUT-based soft eq video filter (-vf eq2)
     * .ogm demuxer endianess fixes
 
 Uwe Reder <Uwe.Reder@3SOFT.de>
--- a/DOCS/it/video.html	Sat Oct 25 12:42:24 2003 +0000
+++ b/DOCS/it/video.html	Sat Oct 25 18:44:41 2003 +0000
@@ -489,7 +489,7 @@
 </P>
 
 <P><B>NOTA:</B> secondo la mia esperienza, la migliore qualità di immagine su EGA
- si ottiene riducendo un po' la luminosità: <CODE>-vop eq=-20:0</CODE>. Sulla
+ si ottiene riducendo un po' la luminosità: <CODE>-vf eq=-20:0</CODE>. Sulla
  mia macchina ho dovuto anche ridurre la frequenza di campionamento dell'audio,
  poichè il suono dava problemi a 44kHz: <CODE>-srate 22050</CODE>.</P>
 
@@ -654,7 +654,7 @@
 e ne usa meno su console standard,
 non-framebuffer. Usa SVGATextMode per selezionare una modalità testo grande,
 e divertiti! (le schede Hercules con uscita secondaria vanno forte :)) (anche
- se, secondo me, puoi usare l'ozione <CODE>-vop 1bpp</CODE> per avere un
+ se, secondo me, puoi usare l'ozione <CODE>-vf 1bpp</CODE> per avere un
  immagine grafica su hgafb:)</P>
 
 <P>Usa l'opzione -framedrop se il tuo computer non è abbastanza veloce da renderizzare tutti i frame!</P>
@@ -1217,7 +1217,7 @@
  con l'algoritmo bilineare veloce. La linea di comando è
 
 <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>Il ritaglio (cropping) può essere fatto sia dal filtro <CODE>crop</CODE> che
@@ -1232,7 +1232,7 @@
  se vuoi invece usare il filtro <CODE>crop</CODE> fai
 
 <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>Usando più di un'opzione <CODE>-zrcrop</CODE> si attiva la modalità
--- a/DOCS/xml/fr/install.xml	Sat Oct 25 12:42:24 2003 +0000
+++ b/DOCS/xml/fr/install.xml	Sat Oct 25 18:44:41 2003 +0000
@@ -328,7 +328,7 @@
 
 <para>
 L'affichage en plein-écran peut être obtenu soit en activant le <emphasis role="bold">
-redimensionnement logiciel</emphasis> (utilisez <option>-zoom</option> ou <option>-vop</option>,
+redimensionnement logiciel</emphasis> (utilisez <option>-zoom</option> ou <option>-vf</option>,
 mais je vous préviens: c'est lent), ou passez dans une résolution plus basse, par exemple 352x288. Si vous
 n'avez pas d'accélération YUV, cette dernière méthode est recommandée. Le changement de mode vidéo peut 
 être activé en utilisant l'option <option>-vm</option> et fonctionne avec les pilotes suivants:
--- a/DOCS/xml/fr/tvinput.xml	Sat Oct 25 12:42:24 2003 +0000
+++ b/DOCS/xml/fr/tvinput.xml	Sat Oct 25 18:44:41 2003 +0000
@@ -60,7 +60,7 @@
 fast-motion et le contrôleur de bitrate ne sera probablement même pas capable de
 garder le bitrate demandé car l'artefact de désentrelacement produit un grand taux de
 détails et donc consomme plus de bande passante. Vous pouvez désactiver
-l'entrelacement avec <option>-vop pp=DEINT_TYPE</option>. Généralement
+l'entrelacement avec <option>-vf pp=DEINT_TYPE</option>. Généralement
 <option>pp=lb</option> peut faire du bon travail, mais c'est une histoire de
 préférence personnelle. Voyez les autres algorithmes de désentrelacement dans le
 manuel et essayez-les.
--- a/DOCS/xml/fr/video.xml	Sat Oct 25 12:42:24 2003 +0000
+++ b/DOCS/xml/fr/video.xml	Sat Oct 25 18:44:41 2003 +0000
@@ -1062,7 +1062,7 @@
 moins de CPU sur une console standard, sans framebuffer. Utilisez SVGATextMode pour
 passer en mode texte large, et appréciez ! (une carte hercules en second écran, c'est
 génial :)) (mais à mon humble avis vous pouvez utiliser l'option
-<option>-vop 1bpp</option> pour avoir des graphismes sur hgafb:)
+<option>-vf 1bpp</option> pour avoir des graphismes sur hgafb:)
 </para>
 </note>
 
--- a/DOCS/xml/ru/install.xml	Sat Oct 25 12:42:24 2003 +0000
+++ b/DOCS/xml/ru/install.xml	Sat Oct 25 18:44:41 2003 +0000
@@ -320,7 +320,7 @@
 
 <para>
 ðÏÌÎÏÜËÒÁÎÎÏÅ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÄÏÓÔÉÇÎÕÔÏ ÌÉÂÏ ×ËÌÀÞÅÎÉÅÍ <emphasis role="bold">ÐÒÏÇÒÁÍÍÎÏÇÏ
-ÍÁÓÛÔÁÂÉÒÏ×ÁÎÉÑ</emphasis> (ÉÓÐÏÌØÚÕÊÔÅ <option>-zoom</option> ÉÌÉ <option>-vop scale</option>
+ÍÁÓÛÔÁÂÉÒÏ×ÁÎÉÑ</emphasis> (ÉÓÐÏÌØÚÕÊÔÅ <option>-zoom</option> ÉÌÉ <option>-vf scale</option>
 ÏÐÃÉÉ, ÎÏ Ñ ÐÒÅÄÕÐÒÅÖÄÁÀ ÷ÁÓ: ÜÔÏ ÍÅÄÌÅÎÎÏ), ÉÌÉ ÐÅÒÅËÌÀÞÅÎÉÅÍ × ×ÉÄÅÏ ÒÅÖÉÍ
 Ó ÍÅÎØÛÉÍ ÒÁÚÒÅÛÅÎÉÅÍ, ÎÁÐÒÉÍÅÒ 352x288. åÓÌÉ Õ ÷ÁÓ ÎÅÔ ÁÐÐÁÒÁÔÎÏÊ YUV ÁËÓÅÌÅÒÁÃÉÉ,
 ÜÔÏÔ ÍÅÔÏÄ ÐÒÅÄÐÏÞÔÉÔÅÌÅÎ. éÚÍÅÎÅÎÉÅ ×ÉÄÅÏ ÒÅÖÉÍÁ ÍÏÖÅÔ ÂÙÔØ ×ËÌÀÞÅÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ
--- a/TOOLS/benchmark-gab/benchmark	Sat Oct 25 12:42:24 2003 +0000
+++ b/TOOLS/benchmark-gab/benchmark	Sat Oct 25 18:44:41 2003 +0000
@@ -43,7 +43,7 @@
 
 if [ ! -e no_codec ]; then
   wrtlog Starting CODEC benchmark runs, with 3 tries...
-  DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vop disabled -autoq 0"
+  DEFAULTOPTS="-quiet -nosound -benchmark -vo null -vf disabled -autoq 0"
   benchsamples
 fi
 
@@ -53,25 +53,25 @@
 if [ ! -e no_xv ]; then
   if [ ! -e no_xv_nodr ]; then
     wrtlog Starting XVideo \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_nodr_noslices ]; then
     wrtlog Starting XVideo \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -nodr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr ]; then
     wrtlog Starting XVideo \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e no_xv_dr_noslices ]; then
     wrtlog Starting XVideo \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xv -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 fi
@@ -79,25 +79,25 @@
 if [ -e xmga ]; then
   if [ ! -e xmga_nodr ]; then
     wrtlog Starting XMGA \(no DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -slices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_nodr_noslices ]; then
     wrtlog Starting XMGA \(no DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -vf disabled -autoq 0"
     benchsamples
   fi
 
   if [ ! -e xmga_dr ]; then
     wrtlog Starting XMGA \(DR\) \(no slices\) benchmark runs, with 3 tries...
-    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vop disabled -autoq 0"
+    DEFAULTOPTS="-quiet -nosound -benchmark -vo xmga -fs -dr -noslices -vf disabled -autoq 0"
     benchsamples
   fi
 fi
--- a/TOOLS/mencvcd	Sat Oct 25 12:42:24 2003 +0000
+++ b/TOOLS/mencvcd	Sat Oct 25 18:44:41 2003 +0000
@@ -162,7 +162,7 @@
    echo "128 starting from 3:00 with frame rate 29.97 fps and input video norm NTSC"
    echo "and output frame rate 23.98 fps because of the 3:2 pulldown method in NTSC."
    echo
-   echo "'$HOWCALLED bj -size 640x272 -vop expand=640:480:0:104:0 \\"
+   echo "'$HOWCALLED bj -size 640x272 -vf expand=640:480:0:104:0 \\"
    echo "        -cdsize 645 -noburn bj.avi'"
    echo "this example above shows you, how to deal with movies which are not"
    echo "created with aspect ratios of 4:3 or 16:9."
@@ -296,7 +296,7 @@
         shift 1
         ;;
       -sid) # mplayer option: have to set vop expand, too!!!
-        sub="-vop pp,expand=-1:-1:-1:-1:1 -sid $2"
+        sub="-vf pp,expand=-1:-1:-1:-1:1 -sid $2"
         shift 1
         ;;
       -size)
--- a/TOOLS/sws-test	Sat Oct 25 12:42:24 2003 +0000
+++ b/TOOLS/sws-test	Sat Oct 25 18:44:41 2003 +0000
@@ -7,13 +7,13 @@
 fi
 
 for i in `seq 0 10` ; do
-	mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vop scale=$3
+	mplayer -vo png $1 -ss $2 -frames 3 -sws $i -vf scale=$3
 	rm 00000001.png
 	mv 00000002.png sws-`basename $1`-$2-$3-$i.png
 done
 
 #gauss with lowwer variance
-        mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vop scale=$3:0:50
+        mplayer -vo png $1 -ss $2 -frames 3 -sws 7 -vf scale=$3:0:50
 	rm 00000001.png
 	mv 00000002.png sws-`basename $1`-$2-$3-7-50.png
 
--- a/cfg-common.h	Sat Oct 25 12:42:24 2003 +0000
+++ b/cfg-common.h	Sat Oct 25 18:44:41 2003 +0000
@@ -170,7 +170,7 @@
 #else
         {"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
-	{"npp", "-npp has been removed, use -vop pp and read the fine manual\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"npp", "-npp has been removed, use -vf pp and read the fine manual.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #ifdef FF_POSTPROCESS
         {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL},
 #endif
--- a/cfg-mencoder.h	Sat Oct 25 12:42:24 2003 +0000
+++ b/cfg-mencoder.h	Sat Oct 25 18:44:41 2003 +0000
@@ -168,8 +168,8 @@
 	{"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2, NULL},
 	{"audio-delay",   &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
 
-	{"x", "This option is obsolete, use -vop scale=w:h for scaling\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"xsize", "This option is obsolete, use -vop crop=w:h:x0:y0 for cropping\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"x", "This option is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"xsize", "This option is obsolete, use -vf crop=w:h:x0:y0 for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 
 	// output audio/video codec selection
 	{"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
--- a/etc/codecs.conf	Sat Oct 25 12:42:24 2003 +0000
+++ b/etc/codecs.conf	Sat Oct 25 18:44:41 2003 +0000
@@ -203,7 +203,7 @@
 
 videocodec cram
   info "Microsoft Video 1"
-  comment "-vop palette required for 8bpp"
+  comment "-vf palette required for 8bpp"
   status buggy
   fourcc cram,CRAM CRAM
   fourcc msvc,MSVC CRAM
--- a/help/help_mp-fr.h	Sat Oct 25 12:42:24 2003 +0000
+++ b/help/help_mp-fr.h	Sat Oct 25 18:44:41 2003 +0000
@@ -133,7 +133,7 @@
 #define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Auteur: %s\n"
 #define MSGTR_AOComment "AO: Commentaire: %s\n"
 #define MSGTR_Video_NoVideo "Vidéo: pas de vidéo\n"
-#define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vidéo (-vop) ou la sortie vidéo (-vo).\n"
+#define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vidéo (-vf) ou la sortie vidéo (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r" // no more than 23 characters (status line for audio files)
 #define MSGTR_PlaylistLoadUnable "\nImpossible de charger la liste de lecture %s.\n"
 #define MSGTR_Exit_SIGILL_RTCpuSel \
@@ -352,7 +352,7 @@
 // vd.c
 #define MSGTR_CodecDidNotSet "VDec: le codec n'a pas défini sh->disp_w et sh->disp_h, essai de contournement !\n"
 #define MSGTR_VoConfigRequest "VDec: requête de configuration de vo - %d x %d (csp préferé: %s)\n"
-#define MSGTR_CouldNotFindColorspace "N'a pas pu trouver d'espace de couleur correspondant - nouvel essai avec -vop scale...\n"
+#define MSGTR_CouldNotFindColorspace "N'a pas pu trouver d'espace de couleur correspondant - nouvel essai avec -vf scale...\n"
 #define MSGTR_MovieAspectIsSet "L'aspect du film est %.2f:1 - pré-redimensionnement à l'aspect correct.\n"
 #define MSGTR_MovieAspectUndefined "L'aspect du film est indéfini - pas de pré-redimensionnement appliqué.\n"
 
--- a/libmpcodecs/vd.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/libmpcodecs/vd.c	Sat Oct 25 18:44:41 2003 +0000
@@ -218,7 +218,7 @@
 	    goto csp_again;
 	} else
 	if(palette==1){
-	    mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vop palette...\n");
+	    mp_msg(MSGT_DECVIDEO,MSGL_V,"vd: Trying -vf palette...\n");
 	    palette=-1;
 	    vf=vf_open_filter(vf,"palette",NULL);
 	    goto csp_again;
--- a/libmpcodecs/ve_libdv.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/libmpcodecs/ve_libdv.c	Sat Oct 25 18:44:41 2003 +0000
@@ -43,7 +43,7 @@
 	unsigned int flags, unsigned int outfmt){
 
     if(width!=DV_WIDTH || (height!=DV_PAL_HEIGHT && height!=DV_NTSC_HEIGHT)){
-	mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! try with -vop scale=720:480\n");
+	mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! Try with -vf scale=720:480\n");
     }
     
     vf->priv->enc->isPAL=(height==DV_PAL_HEIGHT);
--- a/libmpcodecs/vf_cropdetect.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/libmpcodecs/vf_cropdetect.c	Sat Oct 25 18:44:41 2003 +0000
@@ -106,7 +106,7 @@
     x=(vf->priv->x1+1)&(~1);
     y=(vf->priv->y1+1)&(~1);
     
-    printf("crop area: X: %d..%d  Y: %d..%d  (-vop crop=%d:%d:%d:%d)\n",
+    printf("crop area: X: %d..%d  Y: %d..%d  (-vf crop=%d:%d:%d:%d)\n",
 	vf->priv->x1,vf->priv->x2,
 	vf->priv->y1,vf->priv->y2,
 	(vf->priv->x2+1-x)&(~1),(vf->priv->y2+1-y)&(~1),x,y
--- a/libmpcodecs/vf_rectangle.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/libmpcodecs/vf_rectangle.c	Sat Oct 25 18:44:41 2003 +0000
@@ -85,7 +85,7 @@
 
     /* Draw the rectangle */
 
-    mp_msg(MSGT_VFILTER,MSGL_INFO, "rectangle: -vop rectangle=%d:%d:%d:%d \n", vf->priv->w, vf->priv->h, vf->priv->x, vf->priv->y);
+    mp_msg(MSGT_VFILTER,MSGL_INFO, "rectangle: -vf rectangle=%d:%d:%d:%d \n", vf->priv->w, vf->priv->h, vf->priv->x, vf->priv->y);
 
     if (vf->priv->x < 0)
 	x = 0;
--- a/libvo/vo_tdfxfb.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/libvo/vo_tdfxfb.c	Sat Oct 25 18:44:41 2003 +0000
@@ -19,7 +19,7 @@
  *
  * Hints and tricks:
  * - Use -dr to get direct rendering
- * - Use -vop yuy2 to get yuy2 rendering, *MUCH* faster than yv12
+ * - Use -vf yuy2 to get yuy2 rendering, *MUCH* faster than yv12
  * - To get a black background and nice smooth OSD, use -double
  * - To get the console as a background, but with scaled OSD, use -nodouble
  * - The driver supports both scaling and shrinking the image using the -x and
--- a/m_option.c	Sat Oct 25 12:42:24 2003 +0000
+++ b/m_option.c	Sat Oct 25 18:44:41 2003 +0000
@@ -613,7 +613,7 @@
   "\t-pre: Add the given parameters at the begining of the list.\n"
   "\t-del: Remove the entry at the given indices.\n"
   "\t-clr: Clear the list.\n"
-  "e.g: -vop-add flip,mirror -vop-del 2,5\n",  
+  "e.g: -vf-add flip,mirror -vf-del 2,5\n",  
   sizeof(char**),
   M_OPT_TYPE_DYNAMIC | M_OPT_TYPE_ALLOW_WILDCARD,
   parse_str_list,