Mercurial > mplayer.hg

changeset 7124:eca7dbad0166

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
author alex
date Wed, 28 Aug 2002 21:32:32 +0000
parents 0f893a16c316
children 3aeb57cc8ac6
files libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/video_out.h libvo/video_out_internal.h libvo/vo_3dfx.c libvo/vo_aa.c libvo/vo_dga.c libvo/vo_directfb.c libvo/vo_dxr2.c libvo/vo_dxr3.c libvo/vo_fbdev.c libvo/vo_fsdga.c libvo/vo_ggi.c libvo/vo_gif89a.c libvo/vo_gl.c libvo/vo_gl2.c libvo/vo_jpeg.c libvo/vo_md5.c libvo/vo_mga.c libvo/vo_mpegpes.c libvo/vo_null.c libvo/vo_odivx.c libvo/vo_pgm.c libvo/vo_png.c libvo/vo_sdl.c libvo/vo_svga.c libvo/vo_syncfb.c libvo/vo_tdfxfb.c libvo/vo_vesa.c libvo/vo_x11.c libvo/vo_xmga.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_yuv4mpeg.c libvo/vo_zr.c libvo/vosub_vidix.c libvo/vosub_vidix.h mencoder.c mplayer.c
diffstat 39 files changed, 52 insertions(+), 170 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/dec_video.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libmpcodecs/dec_video.c	Wed Aug 28 21:32:32 2002 +0000
@@ -34,7 +34,6 @@
 
 extern double video_time_usage;
 extern double vout_time_usage;
-extern vo_vaa_t vo_vaa;
 
 #include "postproc/postprocess.h"
 
--- a/libmpcodecs/vd.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libmpcodecs/vd.c	Wed Aug 28 21:32:32 2002 +0000
@@ -245,18 +245,17 @@
   }
 
     // Time to config libvo!
-    mp_msg(MSGT_CPLAYER,MSGL_V,"video_out->init(%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
+    mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",
                       sh->disp_w,sh->disp_h,
                       screen_size_x,screen_size_y,
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
                       "MPlayer",out_fmt);
 
-//    memset(&vtune,0,sizeof(vo_tune_info_t));
     if(vf->config(vf,sh->disp_w,sh->disp_h,
                       screen_size_x,screen_size_y,
                       fullscreen|(vidmode<<1)|(softzoom<<2)|(flip<<3),
                       out_fmt)==0){
-//                      "MPlayer",out_fmt,&vtune)){
+//                      "MPlayer",out_fmt)){
 	mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_CannotInitVO);
 	sh->vf_inited=-1;
 	return 0;
--- a/libvo/video_out.h	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/video_out.h	Wed Aug 28 21:32:32 2002 +0000
@@ -21,8 +21,7 @@
 #define VO_EVENT_RESIZE 2
 #define VO_EVENT_KEYPRESS 4
 
-/* takes a pointer to a vo_vaa_s struct */
-#define VOCTRL_QUERY_VAA 1
+/* Obsolete: VOCTRL_QUERY_VAA 1 */
 /* does the device support the required format */
 #define VOCTRL_QUERY_FORMAT 2
 /* signal a device reset seek */
@@ -76,49 +75,6 @@
         const char *comment;
 } vo_info_t;
 
-/* Direct access to BES */
-typedef struct bes_da_s
-{
-	vidix_rect_t	dest;           /* This field should be filled by x,y,w,h
-					   from vidix:src but pitches from
-					   vidix:dest */
-	int		flags;          /* Probably will work only when flag == 0 */
-	/* memory model */
-	unsigned	frame_size;		/* destination frame size */
-	unsigned	num_frames;		/* number of available frames */
-	unsigned	offsets[VID_PLAY_MAXFRAMES]; /* relative offset of each frame from begin of video memory */
-	vidix_yuv_t	offset;			/* relative offsets within frame for yuv planes */
-	void*		dga_addr;		/* linear address of BES */
-}bes_da_t;
-
-/*
-   Video Accelearted Architecture.
-   Every field of this structure can be set to NULL that means that
-   features is not supported
-*/
-typedef struct vo_vaa_s
-{
-	uint32_t    flags; /* currently undefined */
-		/*
-		 * Query Direct Access to BES
-		 * info - information to be filled
-		 * returns: 0 on success errno on error.
-		 */
-	int  (*query_bes_da)(bes_da_t *info);
-	int  (*get_video_eq)(vidix_video_eq_t *info);
-	int  (*set_video_eq)(const vidix_video_eq_t *info);
-	int  (*get_num_fx)(unsigned *info);
-	int  (*get_oem_fx)(vidix_oem_fx_t *info);
-	int  (*set_oem_fx)(const vidix_oem_fx_t *info);
-	int  (*set_deint)(const vidix_deinterlace_t *info);
-}vo_vaa_t;
-
-/* Misc info to tuneup vo driver */
-typedef struct vo_tune_info_s
-{
-	int	pitch[3]; /* Should be 0 if unknown else power of 2 */
-}vo_tune_info_t;
-
 typedef struct vo_functions_s
 {
 	/*
@@ -139,7 +95,7 @@
          */
         uint32_t (*config)(uint32_t width, uint32_t height, uint32_t d_width,
 			 uint32_t d_height, uint32_t fullscreen, char *title,
-			 uint32_t format,const vo_tune_info_t *);
+			 uint32_t format);
 
 	/*
 	 * Control interface
--- a/libvo/video_out_internal.h	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/video_out_internal.h	Wed Aug 28 21:32:32 2002 +0000
@@ -27,7 +27,7 @@
 static uint32_t control(uint32_t request, void *data, ...);
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		     uint32_t d_height, uint32_t fullscreen, char *title,
-		     uint32_t format,const vo_tune_info_t *);
+		     uint32_t format);
 static const vo_info_t* get_info(void);
 static uint32_t draw_frame(uint8_t *src[]);
 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
@@ -37,7 +37,6 @@
 static void uninit(void);
 static uint32_t query_format(uint32_t format);
 static uint32_t preinit(const char *);
-static void query_vaa(vo_vaa_t *);
 
 #define LIBVO_EXTERN(x) vo_functions_t video_out_##x =\
 {\
--- a/libvo/vo_3dfx.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_3dfx.c	Wed Aug 28 21:32:32 2002 +0000
@@ -312,7 +312,7 @@
 }
 
 static uint32_t 
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) 
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) 
 {
 	int fd;
 	char *name = ":0.0";
--- a/libvo/vo_aa.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_aa.c	Wed Aug 28 21:32:32 2002 +0000
@@ -229,7 +229,7 @@
 static uint32_t
 config(uint32_t width, uint32_t height, uint32_t d_width,
 	    uint32_t d_height, uint32_t fullscreen, char *title, 
-	    uint32_t format,const vo_tune_info_t *info) {
+	    uint32_t format) {
     /*
      * main init
      * called by mplayer
--- a/libvo/vo_dga.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_dga.c	Wed Aug 28 21:32:32 2002 +0000
@@ -21,6 +21,9 @@
  *      BGR_32_24_888
  *
  * $Log$
+ * Revision 1.46  2002/08/28 21:32:31  alex
+ * finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
+ *
  * Revision 1.45  2002/05/27 17:14:13  alex
  * revised query_format. added support for native/conversion detection
  *
@@ -795,7 +798,7 @@
 
 static uint32_t config( uint32_t width,  uint32_t height,
                       uint32_t d_width,uint32_t d_height,
-                      uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info )
+                      uint32_t flags,char *title,uint32_t format)
 {
 
   int x_off, y_off;
--- a/libvo/vo_directfb.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_directfb.c	Wed Aug 28 21:32:32 2002 +0000
@@ -529,7 +529,7 @@
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		uint32_t d_height, uint32_t fullscreen, char *title,
-		uint32_t format,const vo_tune_info_t *info)
+		uint32_t format)
 {
   /*
    * (Locals)
--- a/libvo/vo_dxr2.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_dxr2.c	Wed Aug 28 21:32:32 2002 +0000
@@ -583,7 +583,7 @@
 
 }
 
-static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format, const vo_tune_info_t *info)
+static uint32_t config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format)
 {
   int arg;
   dxr2_threeArg_t arg3;
--- a/libvo/vo_dxr3.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_dxr3.c	Wed Aug 28 21:32:32 2002 +0000
@@ -237,7 +237,7 @@
 	return VO_NOTIMPL;
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format, const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 	int tmp1, tmp2, size;
 	em8300_register_t reg;
--- a/libvo/vo_fbdev.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_fbdev.c	Wed Aug 28 21:32:32 2002 +0000
@@ -840,7 +840,7 @@
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
 		uint32_t d_height, uint32_t flags, char *title,
-		uint32_t format,const vo_tune_info_t *info)
+		uint32_t format)
 {
 	struct fb_cmap *cmap;
 	int vm = flags & 0x02;
@@ -1043,7 +1043,7 @@
 		else y_offset = 0;
 		if(vidix_init(width,height,x_offset,y_offset,image_width,
 			    image_height,format,fb_bpp,
-			    fb_xres,fb_yres,info) != 0)
+			    fb_xres,fb_yres) != 0)
 		{
 		    printf(FBDEV "Can't initialize VIDIX driver\n");
 		    vidix_name = NULL;
--- a/libvo/vo_fsdga.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_fsdga.c	Wed Aug 28 21:32:32 2002 +0000
@@ -302,7 +302,7 @@
 
 static uint32_t config( uint32_t width,  uint32_t height,
                       uint32_t d_width,uint32_t d_height,
-                      uint32_t fullscreen,char *title,uint32_t format,const vo_tune_info_t *info )
+                      uint32_t fullscreen,char *title,uint32_t format)
 {
 
   int bank, ram;
--- a/libvo/vo_ggi.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_ggi.c	Wed Aug 28 21:32:32 2002 +0000
@@ -85,7 +85,7 @@
 static void flip_page_directbuffer(void);
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-    uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+    uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
     ggi_mode mode =
     {
--- a/libvo/vo_gif89a.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_gif89a.c	Wed Aug 28 21:32:32 2002 +0000
@@ -50,7 +50,7 @@
 
 static uint32_t config
 	(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, 
-		uint32_t fullscreen, char *title, uint32_t format, const vo_tune_info_t *info) {
+		uint32_t fullscreen, char *title, uint32_t format) {
     char filename[] = "out.gif";
     ColorMapObject *Cmap;
 #ifdef HAVE_GIF_4
--- a/libvo/vo_gl.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_gl.c	Wed Aug 28 21:32:32 2002 +0000
@@ -95,7 +95,7 @@
  * allocate colors and (shared) memory
  */
 static uint32_t 
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 //	int screen;
 	unsigned int fg, bg;
--- a/libvo/vo_gl2.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_gl2.c	Wed Aug 28 21:32:32 2002 +0000
@@ -602,7 +602,7 @@
  * allocate colors and (shared) memory
  */
 static uint32_t 
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 //	int screen;
 	unsigned int fg, bg;
--- a/libvo/vo_jpeg.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_jpeg.c	Wed Aug 28 21:32:32 2002 +0000
@@ -58,7 +58,7 @@
  vo_draw_alpha_rgb24(w, h, src, srca, stride, image_data + 3 * (y0 * image_width + x0), 3 * image_width);
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
  if ( fullscreen&0x04 && ( width != d_width || height != d_height )&&( ( format == IMGFMT_YV12 ) ) )
   {
--- a/libvo/vo_md5.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_md5.c	Wed Aug 28 21:32:32 2002 +0000
@@ -38,10 +38,10 @@
 static FILE * md5_file;
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
     md5_file = fopen ("md5", "w");
-    return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format,info);
+    return video_out_pgm.config (width, height, d_width,d_height,fullscreen, title, format);
 }
 
 static const vo_info_t*
--- a/libvo/vo_mga.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_mga.c	Wed Aug 28 21:32:32 2002 +0000
@@ -58,7 +58,7 @@
 #define FBDEV	"/dev/fb0"
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 
 //	if (f >= 0) mga_uninit();
--- a/libvo/vo_mpegpes.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_mpegpes.c	Wed Aug 28 21:32:32 2002 +0000
@@ -65,7 +65,7 @@
 };
 
 static uint32_t
-config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format)
 {
 #ifdef HAVE_DVB
     switch(s_height){
--- a/libvo/vo_null.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_null.c	Wed Aug 28 21:32:32 2002 +0000
@@ -70,7 +70,7 @@
 }
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 	image_width = width;
 	image_height = height;
--- a/libvo/vo_odivx.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_odivx.c	Wed Aug 28 21:32:32 2002 +0000
@@ -200,7 +200,7 @@
 extern int encode_bitrate;
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 	uint32_t frame_size;
         ENC_PARAM enc_param;
--- a/libvo/vo_pgm.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_pgm.c	Wed Aug 28 21:32:32 2002 +0000
@@ -42,7 +42,7 @@
 char vo_pgm_filename[24];
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
     image_height = height;
     image_width = width;
--- a/libvo/vo_png.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_png.c	Wed Aug 28 21:32:32 2002 +0000
@@ -60,7 +60,7 @@
 }
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
     image_height = height;
     image_width = width;
--- a/libvo/vo_sdl.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_sdl.c	Wed Aug 28 21:32:32 2002 +0000
@@ -759,7 +759,7 @@
  **/
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 //static int sdl_setup (int width, int height)
 {
 	struct sdl_priv_s *priv = &sdl_priv;
--- a/libvo/vo_svga.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_svga.c	Wed Aug 28 21:32:32 2002 +0000
@@ -110,7 +110,7 @@
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
                      uint32_t d_height, uint32_t fullscreen, char *title, 
-		     uint32_t format,const vo_tune_info_t *info) {
+		     uint32_t format) {
   uint32_t req_w = (d_width > 0 ? d_width : width);
   uint32_t req_h = (d_height > 0 ? d_height : height);
   uint16_t vid_mode = 0;
--- a/libvo/vo_syncfb.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_syncfb.c	Wed Aug 28 21:32:32 2002 +0000
@@ -347,7 +347,7 @@
     return 0;
 }
 
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 	uint_32 frame_size;
 
--- a/libvo/vo_tdfxfb.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_tdfxfb.c	Wed Aug 28 21:32:32 2002 +0000
@@ -159,7 +159,8 @@
      since it actually checks the status of the card. 
   */
   /* first wait for the card to be ready, do not try to write every time - alex */
-  do {} while((reg_IO->status & 0x1f) < 1);
+//  do {} while((reg_IO->status & 0x1f) < 1);
+  usec_sleep(10*1000);
   memset(vidpage, 0, screenwidth * screenheight * screendepth);
   
   	if(vo_doublebuffering) {
@@ -203,7 +204,7 @@
 }
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height,
-		uint32_t flags, char *title, uint32_t format, const vo_tune_info_t *info)
+		uint32_t flags, char *title, uint32_t format)
 {
 	screenwidth = fb_vinfo.xres;
 	screenheight = fb_vinfo.yres;
--- a/libvo/vo_vesa.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_vesa.c	Wed Aug 28 21:32:32 2002 +0000
@@ -585,7 +585,7 @@
  */
 
 static uint32_t
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
   struct VbeInfoBlock vib;  
   struct VesaModeInfoBlock vmib;
@@ -930,7 +930,7 @@
 		{
 		  if(vidix_init(width,height,x_offset,y_offset,dstW,
 				dstH,format,dstBpp,
-				video_mode_info.XResolution,video_mode_info.YResolution,info) != 0)
+				video_mode_info.XResolution,video_mode_info.YResolution) != 0)
 		  {
 		    printf("vo_vesa: Can't initialize VIDIX driver\n");
 		    vidix_name = NULL;
--- a/libvo/vo_x11.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_x11.c	Wed Aug 28 21:32:32 2002 +0000
@@ -229,7 +229,7 @@
   myximage=NULL;
 }
 
-static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info)
+static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format)
 {
 // int screen;
  int fullscreen=0;
--- a/libvo/vo_xmga.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_xmga.c	Wed Aug 28 21:32:32 2002 +0000
@@ -203,7 +203,7 @@
    vo_mga_flip_page();
 }
 
-static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t* info)
+static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
  char                 * mTitle=(title == NULL) ? "XMGA render" : title;
  XVisualInfo            vinfo;
--- a/libvo/vo_xv.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_xv.c	Wed Aug 28 21:32:32 2002 +0000
@@ -272,7 +272,7 @@
  * connect to server, create and map window,
  * allocate colors and (shared) memory
  */
-static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
 // int screen;
  char *hello = (title == NULL) ? "Xv render" : title;
--- a/libvo/vo_xvidix.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_xvidix.c	Wed Aug 28 21:32:32 2002 +0000
@@ -58,7 +58,6 @@
 
 /* VIDIX related */
 static char *vidix_name;
-static vo_tune_info_t vtune;
 
 /* Image parameters */
 static uint32_t image_width;
@@ -75,7 +74,7 @@
 
 extern void set_video_eq( int cap );
 
-static void set_window(int force_update,const vo_tune_info_t *info)
+static void set_window(int force_update)
 {
     Window mRoot;
     if ( WinID )
@@ -164,7 +163,7 @@
 	vidix_stop();
 	if (vidix_init(image_width, image_height, vo_dx, vo_dy,
 	    window_width, window_height, image_format, vo_depthonscreen,
-	    vo_screenwidth, vo_screenheight,info) != 0)
+	    vo_screenwidth, vo_screenheight) != 0)
         {
 	    mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
     	    exit_player("vidix error"); /* !!! */
@@ -193,7 +192,7 @@
  * allocate colors and (shared) memory
  */
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
-    uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
+    uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
     XVisualInfo vinfo;
     XSizeHints hint;
@@ -333,10 +332,8 @@
 	vidix_grkey_set(&gr_key);
     }
 
-    set_window(1,info);
+    set_window(1);
 
-    if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t));
-    else     memset(&vtune,0,sizeof(vo_tune_info_t));
     XFlush(mDisplay);
     XSync(mDisplay, False);
 
@@ -359,7 +356,7 @@
     const int event = vo_x11_check_events(mDisplay);
 
     if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE))
-	set_window(0,&vtune);
+	set_window(0);
 
     return;
 }
@@ -445,7 +442,7 @@
       if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
         {
          panscan_calc();
-	 set_window( 0,&vtune );
+	 set_window(0);
         }
       return VO_TRUE;
   case VOCTRL_SET_EQUALIZER:
--- a/libvo/vo_yuv4mpeg.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_yuv4mpeg.c	Wed Aug 28 21:32:32 2002 +0000
@@ -72,7 +72,7 @@
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 
        uint32_t d_height, uint32_t fullscreen, char *title, 
-       uint32_t format, const vo_tune_info_t *tuneinfo)
+       uint32_t format)
 {
 	image_height = height;
 	image_width = width;
--- a/libvo/vo_zr.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vo_zr.c	Wed Aug 28 21:32:32 2002 +0000
@@ -290,7 +290,7 @@
 
 
 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 
-	uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info)
+	uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
 {
 	int i, tmp, stretchx, stretchy;
 	framenum = 0;
--- a/libvo/vosub_vidix.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vosub_vidix.c	Wed Aug 28 21:32:32 2002 +0000
@@ -51,7 +51,6 @@
 static vidix_yuv_t	  dstrides;
 static uint32_t (*server_control)(uint32_t request, void *data, ...);
 
-static int  vidix_get_bes_da(bes_da_t *);
 static int  vidix_get_video_eq(vidix_video_eq_t *info);
 static int  vidix_set_video_eq(const vidix_video_eq_t *info);
 static int  vidix_get_num_fx(unsigned *info);
@@ -389,24 +388,6 @@
     return(vdlSetGrKeys(vidix_handler, gr_key));
 }
 
-static int  vidix_get_bes_da(bes_da_t *info)
-{
-  if(!video_on) return EPERM;
-  info->dest.x = vidix_play.src.x;
-  info->dest.y = vidix_play.src.y;
-  info->dest.w = vidix_play.src.w;
-  info->dest.h = vidix_play.src.h;
-  info->dest.pitch.y = vidix_play.dest.pitch.y;
-  info->dest.pitch.u = vidix_play.dest.pitch.u;
-  info->dest.pitch.v = vidix_play.dest.pitch.v;
-  info->flags = vidix_play.flags;
-  info->frame_size = vidix_play.frame_size;
-  info->num_frames = vidix_play.num_frames;
-  memcpy(info->offsets,vidix_play.offsets,sizeof(unsigned)*vidix_play.num_frames);
-  memcpy(&info->offset,&vidix_play.offset,sizeof(vidix_yuv_t));
-  info->dga_addr = vidix_play.dga_addr;
-  return 0;
-}
 
 static int  vidix_get_video_eq(vidix_video_eq_t *info)
 {
@@ -448,7 +429,7 @@
 int      vidix_init(unsigned src_width,unsigned src_height,
 		   unsigned x_org,unsigned y_org,unsigned dst_width,
 		   unsigned dst_height,unsigned format,unsigned dest_bpp,
-		   unsigned vid_w,unsigned vid_h,const void *info)
+		   unsigned vid_w,unsigned vid_h)
 {
   size_t i;
   int err;
@@ -529,48 +510,7 @@
 	vidix_play.dest.h = dst_height;
 	vidix_play.num_frames=vo_doublebuffering?NUM_FRAMES-1:1;
 	vidix_play.src.pitch.y = vidix_play.src.pitch.u = vidix_play.src.pitch.v = 0;
-	if(info)
-	{
-	switch(((const vo_tune_info_t *)info)->pitch[0])
-	{
-	    case 2:
-	    case 4:
-	    case 8:
-	    case 16:
-	    case 32:
-	    case 64:
-	    case 128:
-	    case 256: vidix_play.src.pitch.y = ((const vo_tune_info_t *)info)->pitch[0];
-		      break;
-	    default: break;
-	}
-	switch(((const vo_tune_info_t *)info)->pitch[1])
-	{
-	    case 2:
-	    case 4:
-	    case 8:
-	    case 16:
-	    case 32:
-	    case 64:
-	    case 128:
-	    case 256: vidix_play.src.pitch.u = ((const vo_tune_info_t *)info)->pitch[1];
-		      break;
-	    default: break;
-	}
-	switch(((const vo_tune_info_t *)info)->pitch[2])
-	{
-	    case 2:
-	    case 4:
-	    case 8:
-	    case 16:
-	    case 32:
-	    case 64:
-	    case 128:
-	    case 256: vidix_play.src.pitch.v = ((const vo_tune_info_t *)info)->pitch[2];
-		      break;
-	    default: break;
-	}
-	}
+
 	if((err=vdlConfigPlayback(vidix_handler,&vidix_play))!=0)
 	{
 		printf("vosub_vidix: Can't configure playback: %s\n",strerror(err));
--- a/libvo/vosub_vidix.h	Wed Aug 28 21:18:33 2002 +0000
+++ b/libvo/vosub_vidix.h	Wed Aug 28 21:32:32 2002 +0000
@@ -17,7 +17,7 @@
 int      vidix_init(unsigned src_width,unsigned src_height,
 		    unsigned dest_x,unsigned dest_y,unsigned dst_width,
 		    unsigned dst_height,unsigned format,unsigned dest_bpp,
-		    unsigned vid_w,unsigned vid_h,const void *info);
+		    unsigned vid_w,unsigned vid_h);
 int	 vidix_start(void);
 int	 vidix_stop(void);
 void     vidix_term( void );
--- a/mencoder.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/mencoder.c	Wed Aug 28 21:32:32 2002 +0000
@@ -61,10 +61,6 @@
 
 #include "fastmemcpy.h"
 
-/**************************************************************************
-             Video accelerated architecture
-**************************************************************************/
-vo_vaa_t vo_vaa;			// FIXME! remove me!
 int vo_doublebuffering=0;
 int vo_directrendering=0;
 int vo_config_count=0;
--- a/mplayer.c	Wed Aug 28 21:18:33 2002 +0000
+++ b/mplayer.c	Wed Aug 28 21:32:32 2002 +0000
@@ -105,11 +105,6 @@
 
 m_config_t* mconfig;
 
-/**************************************************************************
-             Video accelerated architecture
-**************************************************************************/
-vo_vaa_t vo_vaa;
-
 //**************************************************************************//
 //             Config file
 //**************************************************************************//
@@ -510,13 +505,10 @@
 
 int gui_no_filename=0;
 
-//vo_tune_info_t vtune;
-
   mp_msg_init();
   mp_msg_set_level(MSGL_STATUS);
 
   mp_msg(MSGT_CPLAYER,MSGL_INFO,banner_text);
-//  memset(&vtune,0,sizeof(vo_tune_info_t));
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
 #ifdef ARCH_X86
   GetCpuCaps(&gCpuCaps);