[Mplayer-cvslog] CVS: main mencoder.c,1.125,1.126 cfg-common.h,1.40,1.41 cfg-mplayer.h,1.146,1.147

[Arpi of Ize]

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

Modified Files:
	mencoder.c cfg-common.h cfg-mplayer.h 
Log Message:
-xy,-zoom,-flip available in mencoder too

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- mencoder.c	28 Apr 2002 17:48:45 -0000	1.125
+++ mencoder.c	29 Apr 2002 20:07:53 -0000	1.126
@@ -90,6 +90,13 @@
 int audio_family=-1;     // override audio codec family 
 int video_family=-1;     // override video codec family 
 
+// libvo opts: (defiend at libmpcodecs/vd.c)
+extern int screen_size_xy;
+extern float movie_aspect;
+extern int softzoom;
+extern int flip;
+
+
 #ifdef HAVE_MP3LAME
 int out_audio_codec=ACODEC_VBRMP3;
 #else

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cfg-common.h	17 Apr 2002 21:51:17 -0000	1.40
+++ cfg-common.h	29 Apr 2002 20:07:53 -0000	1.41
@@ -101,6 +101,14 @@
 	{"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"vop", &vo_plugin_args, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
 
+        {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+        {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+        {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
+        {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
+	{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
+	{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL},
+	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
+
 // ------------------------- subtitles options --------------------
 
 #ifdef USE_SUB

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- cfg-mplayer.h	17 Apr 2002 21:51:17 -0000	1.146
+++ cfg-mplayer.h	29 Apr 2002 20:07:53 -0000	1.147
@@ -234,20 +234,13 @@
 #endif	
 	{"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
 	{"y", &opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
-	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
 	{"screenw", &vo_screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
 	{"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
-	{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
-	{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL},
 	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-        {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-        {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-        {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
-        {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
        
         {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
 	{"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL},