[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.139,1.140

[Alex Beregszaszi]

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

Modified Files:
	cfg-mplayer.h 
Log Message:
using -dr instead -vaa_dr

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- cfg-mplayer.h	13 Mar 2002 12:32:42 -0000	1.139
+++ cfg-mplayer.h	20 Mar 2002 15:37:36 -0000	1.140
@@ -35,7 +35,6 @@
 extern char *lirc_configfile;
 #endif
 
-#ifndef USE_LIBVO2
 extern int vo_doublebuffering;
 extern int vo_vsync;
 extern int vo_fsmode;
@@ -48,8 +47,7 @@
 extern int vo_gamma_red_intensity;
 extern int vo_gamma_green_intensity;
 extern int vo_gamma_blue_intensity;
-extern int vaa_use_dr;
-#endif
+extern int vo_directrendering;
 
 #ifdef USE_SUB
 extern int sub_unicode;
@@ -253,7 +251,6 @@
         {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
         {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
        
-#ifndef USE_LIBVO2
         {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
 	{"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL},
 	{"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -267,9 +264,10 @@
 	{"red_intensity",&vo_gamma_red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
 	{"green_intensity",&vo_gamma_green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
 	{"blue_intensity",&vo_gamma_blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL},
-        {"vaa_dr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-        {"vaa_nodr", &vaa_use_dr, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-#endif
+	{"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"nodr", &vo_directrendering, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+	{"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 
 #ifdef HAVE_AA
 	{"aa*",	vo_aa_parseoption,  CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption},