From 6403904ae9ffc67aa04da131c514c84e67a1f5df Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 20 Mar 2002 15:39:08 +0000
Subject: [PATCH] using -dr instead -vaa_dr

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5225 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 cfg-mplayer.h           | 12 +++++-------
 dec_video.c             |  4 ++--
 libmpcodecs/dec_video.c |  2 +-
 libmpcodecs/vd.c        |  4 ++--
 libvo/video_out.c       |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 46906c4110..b74ed54940 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -35,7 +35,6 @@ extern int fakemono; // defined in dec_audio.c
 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_hue;
 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 @@ static config_t mplayer_opts[]={
         {"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 @@ static config_t mplayer_opts[]={
 	{"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},
diff --git a/dec_video.c b/dec_video.c
index 5f7073f7a7..cd87435e46 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -802,7 +802,7 @@ if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24))
   return 1;
 }
 
-extern int vaa_use_dr;
+extern int vo_directrendering;
 
 static int use_dr=0,use_dr_422=0;
 static bes_da_t bda;
@@ -813,7 +813,7 @@ void init_video_vaa( unsigned width )
   memset(&bda,0,sizeof(bes_da_t));
   if(vo_vaa.query_bes_da)
     use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1;
-  if(!vaa_use_dr) use_dr = 0;
+  if(!vo_directrendering) use_dr = 0;
   if(use_dr)
   {
     uint32_t sstride,dstride;
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 93aac4d9c2..48b622c2fe 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -148,7 +148,7 @@ int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){
     return 0;
 }
 
-extern int vaa_use_dr;
+extern int vo_directrendering;
 
 int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
 mp_image_t *mpi=NULL;
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 4b41b9c713..65e94999e2 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -88,7 +88,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 };
 
 #include "libvo/video_out.h"
-extern int vaa_use_dr;
+extern int vo_directrendering;
 
 // libvo opts:
 int fullscreen=0;
@@ -286,7 +286,7 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
 
 	// check libvo first!
 	vo_functions_t* vo=sh->video_out;
-	if(vo && vaa_use_dr) vo->control(VOCTRL_GET_IMAGE,mpi);
+	if(vo && vo_directrendering) vo->control(VOCTRL_GET_IMAGE,mpi);
 	
         if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
           // non-direct and not yet allocaed image. allocate it!
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 234c3ce742..cd4af7581d 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -59,7 +59,7 @@ int vo_pts=0; // for hw decoding
 float vo_fps=0; // for mp1e rte
 
 char *vo_subdevice = NULL;
-int vaa_use_dr=1;
+int vo_directrendering=1;
 /****************************************
 *	GAMMA CORRECTION		*
 ****************************************/