From de56d2d9f5b3c5b11c73fba0d01323197d009e04 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Wed, 2 Apr 2008 19:38:34 +0300
Subject: Remove variable arguments from vo control() functions

No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
---
 libvo/mga_common.c         | 2 +-
 libvo/vesa_lvo.c           | 4 ++--
 libvo/video_out.h          | 2 +-
 libvo/video_out_internal.h | 2 +-
 libvo/vo_3dfx.c            | 2 +-
 libvo/vo_aa.c              | 2 +-
 libvo/vo_bl.c              | 2 +-
 libvo/vo_caca.c            | 2 +-
 libvo/vo_cvidix.c          | 2 +-
 libvo/vo_dfbmga.c          | 2 +-
 libvo/vo_dga.c             | 2 +-
 libvo/vo_directfb2.c       | 2 +-
 libvo/vo_directx.c         | 2 +-
 libvo/vo_dxr2.c            | 2 +-
 libvo/vo_dxr3.c            | 2 +-
 libvo/vo_fbdev.c           | 2 +-
 libvo/vo_fbdev2.c          | 2 +-
 libvo/vo_ggi.c             | 2 +-
 libvo/vo_gif89a.c          | 2 +-
 libvo/vo_gl.c              | 2 +-
 libvo/vo_gl2.c             | 2 +-
 libvo/vo_ivtv.c            | 2 +-
 libvo/vo_jpeg.c            | 2 +-
 libvo/vo_md5sum.c          | 2 +-
 libvo/vo_mpegpes.c         | 2 +-
 libvo/vo_null.c            | 2 +-
 libvo/vo_png.c             | 2 +-
 libvo/vo_pnm.c             | 2 +-
 libvo/vo_quartz.c          | 2 +-
 libvo/vo_s3fb.c            | 2 +-
 libvo/vo_sdl.c             | 2 +-
 libvo/vo_svga.c            | 2 +-
 libvo/vo_tdfx_vid.c        | 2 +-
 libvo/vo_tdfxfb.c          | 2 +-
 libvo/vo_tga.c             | 2 +-
 libvo/vo_v4l2.c            | 2 +-
 libvo/vo_vesa.c            | 2 +-
 libvo/vo_winvidix.c        | 2 +-
 libvo/vo_x11.c             | 2 +-
 libvo/vo_xover.c           | 3 +--
 libvo/vo_xv.c              | 2 +-
 libvo/vo_xvidix.c          | 2 +-
 libvo/vo_xvmc.c            | 2 +-
 libvo/vo_xvr100.c          | 2 +-
 libvo/vo_yuv4mpeg.c        | 2 +-
 libvo/vo_zr.c              | 2 +-
 libvo/vo_zr2.c             | 2 +-
 libvo/vosub_vidix.c        | 2 +-
 libvo/vosub_vidix.h        | 2 +-
 49 files changed, 50 insertions(+), 51 deletions(-)

(limited to 'libvo')

diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 1677104c9e..88997fb194 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -229,7 +229,7 @@ static void mga_fullscreen()
 }
 #endif
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index ea5ecc93a1..cbb4e800dd 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -43,7 +43,7 @@ static uint8_t *lvo_mem = NULL;
 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) )
@@ -303,7 +303,7 @@ uint32_t vlvo_query_info(uint32_t format)
   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 --git a/libvo/video_out.h b/libvo/video_out.h
index ae9a1c3e03..06f93814fc 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -142,7 +142,7 @@ typedef struct vo_functions_s
 	/*
 	 * 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 --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h
index 83f38d5771..1bfb91d18c 100644
--- a/libvo/video_out_internal.h
+++ b/libvo/video_out_internal.h
@@ -30,7 +30,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 --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c
index d4612e77ac..dcb58d3aa3 100644
--- a/libvo/vo_3dfx.c
+++ b/libvo/vo_3dfx.c
@@ -497,7 +497,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 8ba01d6569..f297e01b71 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -718,7 +718,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index f99599fea2..1aaa5c888a 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -465,7 +465,7 @@ static int preinit(const char *arg) {
 	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 --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 3fd1fcd1cd..46dab1d7c6 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -322,7 +322,7 @@ static int query_format(uint32_t format)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch(request)
     {
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c
index 9b6c593fb3..3e54616b50 100644
--- a/libvo/vo_cvidix.c
+++ b/libvo/vo_cvidix.c
@@ -156,7 +156,7 @@ static int preinit(const char *arg){
   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 --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index ee3bf7489b..d829dc219a 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -1381,7 +1381,7 @@ get_equalizer( char *data, int *value )
 }
 
 static int
-control( uint32_t request, void *data, ... )
+control( uint32_t request, void *data)
 {
      switch (request) {
      case VOCTRL_GUISUPPORT:
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index f194beeef0..70079440b6 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -984,7 +984,7 @@ static uint32_t get_image(mp_image_t * mpi)
     return (VO_FALSE);
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index a9bc40cdc5..b8acb74080 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -1411,7 +1411,7 @@ static uint32_t put_image(mp_image_t *mpi){
 
 
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
     case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index a110c48468..a241631bea 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -1472,7 +1472,7 @@ static uint32_t color_ctrl_get(char *what, int *value)
 	return r;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
    
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 93ad86f610..4b0d47326c 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -906,7 +906,7 @@ static int preinit(const char *arg) {
   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 --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index a48c7becbf..0a5e2b486f 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -162,7 +162,7 @@ static overlay_t *overlay_data;
 /* 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 --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 12f48fdeea..1f99ef08d7 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -1163,7 +1163,7 @@ static uint32_t get_image(mp_image_t *mpi)
     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 --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c
index 30bbc35792..0b6fda1ea7 100644
--- a/libvo/vo_fbdev2.c
+++ b/libvo/vo_fbdev2.c
@@ -398,7 +398,7 @@ static void uninit(void)
 	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 --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c
index ad28aeb05f..009c3c2e2b 100644
--- a/libvo/vo_ggi.c
+++ b/libvo/vo_ggi.c
@@ -452,7 +452,7 @@ static void uninit(void)
     ggiExit();
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
     case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index 6422ec7ecb..58da54e8cb 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -336,7 +336,7 @@ static int query_format(uint32_t format)
 	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 --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 36fbff4186..036974cb69 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -887,7 +887,7 @@ static int preinit(const char *arg)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_PAUSE: return (int_pause=1);
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index d83c5a3363..735e29195f 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -867,7 +867,7 @@ static int preinit(const char *arg)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
     case VOCTRL_PAUSE: return (int_pause=1);
diff --git a/libvo/vo_ivtv.c b/libvo/vo_ivtv.c
index 4396dc166f..36efe18f58 100644
--- a/libvo/vo_ivtv.c
+++ b/libvo/vo_ivtv.c
@@ -282,7 +282,7 @@ query_format (uint32_t format)
 }
 
 static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
 {
   switch (request)
   {
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index e8ac699fa8..e103f872f3 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -405,7 +405,7 @@ static int preinit(const char *arg)
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c
index 29f54a9b5a..8c4aca219b 100644
--- a/libvo/vo_md5sum.c
+++ b/libvo/vo_md5sum.c
@@ -263,7 +263,7 @@ static int query_format(uint32_t format)
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index d251ff75df..27f002e693 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -255,7 +255,7 @@ static void check_events(void)
 {
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_null.c b/libvo/vo_null.c
index c56a26511f..6f45af0e10 100644
--- a/libvo/vo_null.c
+++ b/libvo/vo_null.c
@@ -98,7 +98,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_png.c b/libvo/vo_png.c
index 791dfd515d..3c5f109aa2 100644
--- a/libvo/vo_png.c
+++ b/libvo/vo_png.c
@@ -223,7 +223,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c
index df1a070b5a..878f063b06 100644
--- a/libvo/vo_pnm.c
+++ b/libvo/vo_pnm.c
@@ -543,7 +543,7 @@ static int query_format(uint32_t format)
 
 /* ------------------------------------------------------------------------- */
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request) {
         case VOCTRL_QUERY_FORMAT:
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 240291bbf8..40e704905b 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -1232,7 +1232,7 @@ static uint32_t get_yuv_image(mp_image_t *mpi)
 	return VO_FALSE;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
 	switch (request)
 	{
diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c
index 778374e2d1..e36348e8cd 100644
--- a/libvo/vo_s3fb.c
+++ b/libvo/vo_s3fb.c
@@ -504,7 +504,7 @@ static uint32_t get_image(mp_image_t *mpi)
   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 --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index a5bf64a4a2..13d5d0fe73 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -1660,7 +1660,7 @@ static uint32_t get_image(mp_image_t *mpi)
     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 --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 9d38c8d4cd..31b103f9c2 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -350,7 +350,7 @@ static int find_best_svga_mode(int req_w,int req_h, int req_bpp){
   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 --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c
index 522f5e928d..501017f0f7 100644
--- a/libvo/vo_tdfx_vid.c
+++ b/libvo/vo_tdfx_vid.c
@@ -646,7 +646,7 @@ static uint32_t set_colorkey(mp_colorkey_t* colork) {
   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 --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c
index 6cdb07563c..fb825c37f3 100644
--- a/libvo/vo_tdfxfb.c
+++ b/libvo/vo_tdfxfb.c
@@ -478,7 +478,7 @@ static uint32_t get_image(mp_image_t *mpi)
 	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 --git a/libvo/vo_tga.c b/libvo/vo_tga.c
index 0977f91074..3a1d1fb6ff 100644
--- a/libvo/vo_tga.c
+++ b/libvo/vo_tga.c
@@ -242,7 +242,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_v4l2.c b/libvo/vo_v4l2.c
index cb09d3fa4e..bce01f5f2e 100644
--- a/libvo/vo_v4l2.c
+++ b/libvo/vo_v4l2.c
@@ -250,7 +250,7 @@ query_format (uint32_t format)
 }
 
 static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
 {
   switch (request)
   {
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index f5eb0e11c0..f5a40d284a 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -1090,7 +1090,7 @@ static int preinit(const char *arg)
   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 --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 97ff41dd36..a66b062cdf 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -329,7 +329,7 @@ static int preinit(const char *arg){
     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 --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 2b56ee48b6..cc9ca02a6c 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -748,7 +748,7 @@ static int preinit(const char *arg)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 46f8f83fcf..77d8306151 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -427,7 +427,7 @@ static int preinit(const char *arg)
   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) {
@@ -449,7 +449,6 @@ static int control(uint32_t request, void *data, ...)
       }
     return VO_TRUE;
   default:
-    // Safe atm bcs nothing use more than 1 arg
     return sub_vo->control(request,data);
   }
   return VO_NOTIMPL;
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 36d4d67940..bdb4d6bc19 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -839,7 +839,7 @@ static int preinit(const char *arg)
     return 0;
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index fdd82d8b5c..260cdc9ba1 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -470,7 +470,7 @@ static int preinit(const char *arg)
     return (0);
 }
 
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
 {
     switch (request)
     {
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index efa4e5dd0d..d2875104bd 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -1355,7 +1355,7 @@ assert(rndr->next_free_data_block_num == 0);
 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 --git a/libvo/vo_xvr100.c b/libvo/vo_xvr100.c
index ff92018ad9..a22a655f6d 100644
--- a/libvo/vo_xvr100.c
+++ b/libvo/vo_xvr100.c
@@ -429,7 +429,7 @@ static int query_format(uint32_t format)
     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 --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c
index 285846278b..759f0537ec 100644
--- a/libvo/vo_yuv4mpeg.c
+++ b/libvo/vo_yuv4mpeg.c
@@ -538,7 +538,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_zr.c b/libvo/vo_zr.c
index 26d868ffd4..3f67d94648 100644
--- a/libvo/vo_zr.c
+++ b/libvo/vo_zr.c
@@ -814,7 +814,7 @@ static int preinit(const char *arg)
     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 --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c
index 362ae49860..c50e95c1bc 100644
--- a/libvo/vo_zr2.c
+++ b/libvo/vo_zr2.c
@@ -433,7 +433,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 	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 --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index 83a7fcc2be..2291814810 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -533,7 +533,7 @@ static uint32_t vidix_get_image(mp_image_t *mpi)
     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:
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index c6427be7b2..0c2e30d793 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -24,7 +24,7 @@ int      vidix_init(unsigned src_width,unsigned src_height,
 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);
 
 uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y);
-- 
cgit v1.2.3