# HG changeset patch
# User iive
# Date 1304765951 0
# Node ID ddb45e9443eccf33610413cd7e06782d996a918e
# Parent  d63bf64a209459dcd98da1df4a0ba59ba91172ca
Remove the variable arguments from the libvo control() functions.

No module uses the vaarg anymore. Also it is cleaner to provide
pointer to specific structure than specify arguments via vaarg.

diff -r d63bf64a2094 -r ddb45e9443ec libvo/mga_template.c
--- a/libvo/mga_template.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/mga_template.c	Sat May 07 10:59:11 2011 +0000
@@ -236,7 +236,7 @@
 }
 #endif
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vesa_lvo.c
--- a/libvo/vesa_lvo.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vesa_lvo.c	Sat May 07 10:59:11 2011 +0000
@@ -53,7 +53,7 @@
 static uint8_t next_frame;
 static mga_vid_config_t mga_vid_config;
 static unsigned image_bpp,image_height,image_width,src_format;
-uint32_t vlvo_control(uint32_t request, void *data, ...);
+uint32_t vlvo_control(uint32_t request, void *data);
 
 #define PIXEL_SIZE() ((video_mode_info.BitsPerPixel+7)/8)
 #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) )
@@ -309,7 +309,7 @@
   return VFCAP_CSP_SUPPORTED;
 }
 
-uint32_t vlvo_control(uint32_t request, void *data, ...)
+uint32_t vlvo_control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/video_out.h
--- a/libvo/video_out.h	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/video_out.h	Sat May 07 10:59:11 2011 +0000
@@ -147,7 +147,7 @@
     /*
      * Control interface
      */
-    int (*control)(uint32_t request, void *data, ...);
+    int (*control)(uint32_t request, void *data);
 
     /*
      * Display a new RGB/BGR frame of the video to the screen.
diff -r d63bf64a2094 -r ddb45e9443ec libvo/video_out_internal.h
--- a/libvo/video_out_internal.h	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/video_out_internal.h	Sat May 07 10:59:11 2011 +0000
@@ -28,7 +28,7 @@
 #include "libmpcodecs/mp_image.h"
 #include "geometry.h"
 
-static int control(uint32_t request, void *data, ...);
+static int control(uint32_t request, void *data);
 static int config(uint32_t width, uint32_t height, uint32_t d_width,
 		     uint32_t d_height, uint32_t fullscreen, char *title,
 		     uint32_t format);
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_3dfx.c
--- a/libvo/vo_3dfx.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_3dfx.c	Sat May 07 10:59:11 2011 +0000
@@ -497,7 +497,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_aa.c
--- a/libvo/vo_aa.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_aa.c	Sat May 07 10:59:11 2011 +0000
@@ -726,7 +726,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_bl.c
--- a/libvo/vo_bl.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_bl.c	Sat May 07 10:59:11 2011 +0000
@@ -470,7 +470,7 @@
 	return 0;
 }
 
-static int control(uint32_t request, void *data, ...) {
+static int control(uint32_t request, void *data) {
 	switch (request) {
 		case VOCTRL_QUERY_FORMAT:
 			return query_format(*((uint32_t*)data));
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_caca.c
--- a/libvo/vo_caca.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_caca.c	Sat May 07 10:59:11 2011 +0000
@@ -335,7 +335,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch(request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_cvidix.c
--- a/libvo/vo_cvidix.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_cvidix.c	Sat May 07 10:59:11 2011 +0000
@@ -164,7 +164,7 @@
   return 0;
 }
 
-static int control(uint32_t request, void *data, ...){
+static int control(uint32_t request, void *data){
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
     return query_format(*((uint32_t*)data));
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_dfbmga.c
--- a/libvo/vo_dfbmga.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_dfbmga.c	Sat May 07 10:59:11 2011 +0000
@@ -1409,7 +1409,7 @@
 }
 
 static int
-control( uint32_t request, void *data, ... )
+control( uint32_t request, void *data )
 {
      switch (request) {
      case VOCTRL_GUISUPPORT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_dga.c
--- a/libvo/vo_dga.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_dga.c	Sat May 07 10:59:11 2011 +0000
@@ -984,7 +984,7 @@
     return VO_FALSE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_direct3d.c
--- a/libvo/vo_direct3d.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_direct3d.c	Sat May 07 10:59:11 2011 +0000
@@ -760,7 +760,7 @@
 /** @brief libvo Callback: Handle control requests.
  *  @return VO_TRUE on success, VO_NOTIMPL when not implemented
  */
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_directfb2.c
--- a/libvo/vo_directfb2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_directfb2.c	Sat May 07 10:59:11 2011 +0000
@@ -1372,7 +1372,7 @@
 
 
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
     case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_directx.c
--- a/libvo/vo_directx.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_directx.c	Sat May 07 10:59:11 2011 +0000
@@ -1475,7 +1475,7 @@
 	return r;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
 
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_dxr2.c
--- a/libvo/vo_dxr2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_dxr2.c	Sat May 07 10:59:11 2011 +0000
@@ -920,7 +920,7 @@
   return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_dxr3.c
--- a/libvo/vo_dxr3.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_dxr3.c	Sat May 07 10:59:11 2011 +0000
@@ -175,7 +175,7 @@
 /* Functions for working with the em8300's internal clock */
 /* End of internal clock functions */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
 	switch (request) {
 	case VOCTRL_GUISUPPORT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_fbdev.c
--- a/libvo/vo_fbdev.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_fbdev.c	Sat May 07 10:59:11 2011 +0000
@@ -1150,7 +1150,7 @@
     return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_GET_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_fbdev2.c
--- a/libvo/vo_fbdev2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_fbdev2.c	Sat May 07 10:59:11 2011 +0000
@@ -397,7 +397,7 @@
 	fb_preinit(1); // so that later calls to preinit don't fail
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_ggi.c
--- a/libvo/vo_ggi.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_ggi.c	Sat May 07 10:59:11 2011 +0000
@@ -467,7 +467,7 @@
     ggiExit();
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_gif89a.c
--- a/libvo/vo_gif89a.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_gif89a.c	Sat May 07 10:59:11 2011 +0000
@@ -335,7 +335,7 @@
 	return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
 	if (request == VOCTRL_QUERY_FORMAT) {
 		return query_format(*((uint32_t*)data));
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_gl.c
--- a/libvo/vo_gl.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_gl.c	Sat May 07 10:59:11 2011 +0000
@@ -1307,7 +1307,7 @@
   {NULL,          NULL,       0                 }
 };
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_PAUSE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_gl2.c
--- a/libvo/vo_gl2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_gl2.c	Sat May 07 10:59:11 2011 +0000
@@ -885,7 +885,7 @@
     return -1;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
     case VOCTRL_PAUSE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_ivtv.c
--- a/libvo/vo_ivtv.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_ivtv.c	Sat May 07 10:59:11 2011 +0000
@@ -286,7 +286,7 @@
 }
 
 static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
 {
   switch (request)
   {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_jpeg.c
--- a/libvo/vo_jpeg.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_jpeg.c	Sat May 07 10:59:11 2011 +0000
@@ -399,7 +399,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_kva.c
--- a/libvo/vo_kva.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_kva.c	Sat May 07 10:59:11 2011 +0000
@@ -949,7 +949,7 @@
     return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_GET_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_matrixview.c
--- a/libvo/vo_matrixview.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_matrixview.c	Sat May 07 10:59:11 2011 +0000
@@ -276,7 +276,7 @@
 }
 
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_PAUSE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_md5sum.c
--- a/libvo/vo_md5sum.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_md5sum.c	Sat May 07 10:59:11 2011 +0000
@@ -259,7 +259,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_mpegpes.c
--- a/libvo/vo_mpegpes.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_mpegpes.c	Sat May 07 10:59:11 2011 +0000
@@ -241,7 +241,7 @@
 {
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_null.c
--- a/libvo/vo_null.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_null.c	Sat May 07 10:59:11 2011 +0000
@@ -98,7 +98,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_png.c
--- a/libvo/vo_png.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_png.c	Sat May 07 10:59:11 2011 +0000
@@ -241,7 +241,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_DRAW_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_pnm.c
--- a/libvo/vo_pnm.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_pnm.c	Sat May 07 10:59:11 2011 +0000
@@ -542,7 +542,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_quartz.c
--- a/libvo/vo_quartz.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_quartz.c	Sat May 07 10:59:11 2011 +0000
@@ -1158,7 +1158,7 @@
     return VO_FALSE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_s3fb.c
--- a/libvo/vo_s3fb.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_s3fb.c	Sat May 07 10:59:11 2011 +0000
@@ -529,7 +529,7 @@
   return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch(request) {
   case VOCTRL_GET_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_sdl.c	Sat May 07 10:59:11 2011 +0000
@@ -1515,7 +1515,7 @@
     return VO_FALSE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   struct sdl_priv_s *priv = &sdl_priv;
   switch (request) {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_svga.c
--- a/libvo/vo_svga.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_svga.c	Sat May 07 10:59:11 2011 +0000
@@ -353,7 +353,7 @@
     return bestmode;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_tdfx_vid.c
--- a/libvo/vo_tdfx_vid.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_tdfx_vid.c	Sat May 07 10:59:11 2011 +0000
@@ -644,7 +644,7 @@
   return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_tdfxfb.c
--- a/libvo/vo_tdfxfb.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_tdfxfb.c	Sat May 07 10:59:11 2011 +0000
@@ -496,7 +496,7 @@
 	return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
 	switch(request) {
 	case VOCTRL_GET_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_tga.c
--- a/libvo/vo_tga.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_tga.c	Sat May 07 10:59:11 2011 +0000
@@ -219,7 +219,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
       case VOCTRL_DRAW_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_v4l2.c
--- a/libvo/vo_v4l2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_v4l2.c	Sat May 07 10:59:11 2011 +0000
@@ -254,7 +254,7 @@
 }
 
 static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
 {
   switch (request)
   {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_vdpau.c
--- a/libvo/vo_vdpau.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_vdpau.c	Sat May 07 10:59:11 2011 +0000
@@ -1314,7 +1314,7 @@
     return update_csc_matrix();
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     if (handle_preemption() < 0)
         return VO_FALSE;
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_vesa.c
--- a/libvo/vo_vesa.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_vesa.c	Sat May 07 10:59:11 2011 +0000
@@ -1083,7 +1083,7 @@
   return pre_init_err;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_wii.c
--- a/libvo/vo_wii.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_wii.c	Sat May 07 10:59:11 2011 +0000
@@ -351,7 +351,7 @@
   return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   if (request == VOCTRL_GET_IMAGE)
     return get_image(data);
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_winvidix.c
--- a/libvo/vo_winvidix.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_winvidix.c	Sat May 07 10:59:11 2011 +0000
@@ -330,7 +330,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...){
+static int control(uint32_t request, void *data){
   switch (request) {
   case VOCTRL_FULLSCREEN:
     if(!vo_fs){vo_fs=1;ShowWindow(hWndFS,SW_SHOW);SetForegroundWindow(hWndFS);}
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_x11.c
--- a/libvo/vo_x11.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_x11.c	Sat May 07 10:59:11 2011 +0000
@@ -655,7 +655,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_xover.c
--- a/libvo/vo_xover.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_xover.c	Sat May 07 10:59:11 2011 +0000
@@ -412,7 +412,7 @@
   return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   if(!sub_vo) return VO_ERROR;
   switch (request) {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_xv.c
--- a/libvo/vo_xv.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_xv.c	Sat May 07 10:59:11 2011 +0000
@@ -732,7 +732,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_xvidix.c
--- a/libvo/vo_xvidix.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_xvidix.c	Sat May 07 10:59:11 2011 +0000
@@ -389,7 +389,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_xvmc.c
--- a/libvo/vo_xvmc.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_xvmc.c	Sat May 07 10:59:11 2011 +0000
@@ -1291,7 +1291,7 @@
 return VO_TRUE;
 }
 
-static int control(uint32_t request, void *data, ... )
+static int control(uint32_t request, void *data)
 {
     switch (request){
         case VOCTRL_GET_DEINTERLACE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_xvr100.c
--- a/libvo/vo_xvr100.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_xvr100.c	Sat May 07 10:59:11 2011 +0000
@@ -428,7 +428,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_GET_IMAGE:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_yuv4mpeg.c
--- a/libvo/vo_yuv4mpeg.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_yuv4mpeg.c	Sat May 07 10:59:11 2011 +0000
@@ -297,7 +297,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_zr.c
--- a/libvo/vo_zr.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_zr.c	Sat May 07 10:59:11 2011 +0000
@@ -831,7 +831,7 @@
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vo_zr2.c
--- a/libvo/vo_zr2.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vo_zr2.c	Sat May 07 10:59:11 2011 +0000
@@ -451,7 +451,7 @@
 	return 0;
 }
 
-static int control(uint32_t request, void *data, ...) {
+static int control(uint32_t request, void *data) {
 	switch (request) {
   		case VOCTRL_QUERY_FORMAT:
 			return query_format(*((uint32_t*)data));
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vosub_vidix.c
--- a/libvo/vosub_vidix.c	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vosub_vidix.c	Sat May 07 10:59:11 2011 +0000
@@ -62,7 +62,7 @@
 static vidix_fourcc_t	  vidix_fourcc;
 static vo_functions_t *   vo_server;
 static vidix_yuv_t	  dstrides;
-/*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/
+/*static uint32_t (*server_control)(uint32_t request, void *data);*/
 
 int vidix_start(void)
 {
@@ -577,7 +577,7 @@
     return VO_FALSE;
 }
 
-uint32_t vidix_control(uint32_t request, void *data, ...)
+uint32_t vidix_control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
@@ -665,7 +665,6 @@
   }
   }
   return VO_NOTIMPL;
-  // WARNING: we drop extra parameters (...) here!
 //  return server_control(request,data); //VO_NOTIMPL;
 }
 
diff -r d63bf64a2094 -r ddb45e9443ec libvo/vosub_vidix.h
--- a/libvo/vosub_vidix.h	Sat May 07 10:44:57 2011 +0000
+++ b/libvo/vosub_vidix.h	Sat May 07 10:59:11 2011 +0000
@@ -35,7 +35,7 @@
 int	 vidix_start(void);
 int	 vidix_stop(void);
 void     vidix_term( void );
-uint32_t vidix_control(uint32_t request, void *data, ...);
+uint32_t vidix_control(uint32_t request, void *data);
 uint32_t vidix_query_fourcc(uint32_t fourcc);
 
 #include "vidix/vidix.h"