[Mplayer-cvslog] CVS: main m_option.c,1.22,1.23 cfg-mencoder.h,1.70,1.71 cfg-common.h,1.117,1.118 AUTHORS,1.37,1.38

[Diego Biurrun CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv32042

Modified Files:
	m_option.c cfg-mencoder.h cfg-common.h AUTHORS 
Log Message:
-vop ---> -vf


Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- m_option.c	31 Aug 2003 21:11:35 -0000	1.22
+++ m_option.c	25 Oct 2003 18:44:41 -0000	1.23
@@ -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,

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- cfg-mencoder.h	19 Aug 2003 15:10:10 -0000	1.70
+++ cfg-mencoder.h	25 Oct 2003 18:44:41 -0000	1.71
@@ -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},

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- cfg-common.h	22 Oct 2003 19:01:05 -0000	1.117
+++ cfg-common.h	25 Oct 2003 18:44:41 -0000	1.118
@@ -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

Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AUTHORS	22 Oct 2003 16:43:29 -0000	1.37
+++ AUTHORS	25 Oct 2003 18:44:41 -0000	1.38
@@ -345,7 +345,7 @@
     * rawdv demuxer fixes
 
 Hampa Hug <hhug at 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 at 3SOFT.de>