# HG changeset patch
# User nick
# Date 1012728538 0
# Node ID 382a3c60629e5de599fbbad7ba31c0aabbb0d081
# Parent  be41ab8c8918c945ece198d303c8c853a18efd4e
Allows to users control direct rendering

diff -r be41ab8c8918 -r 382a3c60629e cfg-mplayer.h
--- a/cfg-mplayer.h	Sun Feb 03 09:12:32 2002 +0000
+++ b/cfg-mplayer.h	Sun Feb 03 09:28:58 2002 +0000
@@ -47,6 +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
 
 #ifdef USE_SUB
@@ -254,6 +255,8 @@
 	{"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
 
 #ifdef HAVE_AA
diff -r be41ab8c8918 -r 382a3c60629e dec_video.c
--- a/dec_video.c	Sun Feb 03 09:12:32 2002 +0000
+++ b/dec_video.c	Sun Feb 03 09:28:58 2002 +0000
@@ -747,6 +747,7 @@
   return 1;
 }
 
+extern int vaa_use_dr;
 #ifdef USE_LIBVO2
 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){
 #else
@@ -776,6 +777,7 @@
   use_dr = 0;
   if(vo_vaa.query_bes_da)
     use_dr = vo_vaa.query_bes_da(&bda) ? 0 : 1;
+  if(!vaa_use_dr) use_dr = 0;
 #ifdef USE_MP_IMAGE
 if(mpi->type!=MP_IMGTYPE_EXPORT)
 if( !(mpi->flags&MP_IMGFLAG_ALLOCATED) && !(mpi->flags&MP_IMGFLAG_DIRECT) ){
diff -r be41ab8c8918 -r 382a3c60629e libvo/video_out.c
--- a/libvo/video_out.c	Sun Feb 03 09:12:32 2002 +0000
+++ b/libvo/video_out.c	Sun Feb 03 09:28:58 2002 +0000
@@ -47,6 +47,7 @@
 float vo_fps=0; // for mp1e rte
 
 char *vo_subdevice = NULL;
+int vaa_use_dr=1;
 /****************************************
 *	GAMMA CORRECTION		*
 ****************************************/
diff -r be41ab8c8918 -r 382a3c60629e mencoder.c
--- a/mencoder.c	Sun Feb 03 09:12:32 2002 +0000
+++ b/mencoder.c	Sun Feb 03 09:28:58 2002 +0000
@@ -93,6 +93,7 @@
 **************************************************************************/
 vo_vaa_t vo_vaa;
 int vo_doublebuffering;
+int vaa_use_dr;
 
 //--------------------------