[MPlayer-cvslog] r33392 - in trunk/libvo: mga_template.c vesa_lvo.c video_out.h video_out_internal.h vo_3dfx.c vo_aa.c vo_bl.c vo_caca.c vo_cvidix.c vo_dfbmga.c vo_dga.c vo_direct3d.c vo_directfb2.c vo_directx.c vo...
iive
subversion at mplayerhq.hu
Sat May 7 12:59:11 CEST 2011
Author: iive
Date: Sat May 7 12:59:11 2011
New Revision: 33392
Log:
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.
Modified:
trunk/libvo/mga_template.c
trunk/libvo/vesa_lvo.c
trunk/libvo/video_out.h
trunk/libvo/video_out_internal.h
trunk/libvo/vo_3dfx.c
trunk/libvo/vo_aa.c
trunk/libvo/vo_bl.c
trunk/libvo/vo_caca.c
trunk/libvo/vo_cvidix.c
trunk/libvo/vo_dfbmga.c
trunk/libvo/vo_dga.c
trunk/libvo/vo_direct3d.c
trunk/libvo/vo_directfb2.c
trunk/libvo/vo_directx.c
trunk/libvo/vo_dxr2.c
trunk/libvo/vo_dxr3.c
trunk/libvo/vo_fbdev.c
trunk/libvo/vo_fbdev2.c
trunk/libvo/vo_ggi.c
trunk/libvo/vo_gif89a.c
trunk/libvo/vo_gl.c
trunk/libvo/vo_gl2.c
trunk/libvo/vo_ivtv.c
trunk/libvo/vo_jpeg.c
trunk/libvo/vo_kva.c
trunk/libvo/vo_matrixview.c
trunk/libvo/vo_md5sum.c
trunk/libvo/vo_mpegpes.c
trunk/libvo/vo_null.c
trunk/libvo/vo_png.c
trunk/libvo/vo_pnm.c
trunk/libvo/vo_quartz.c
trunk/libvo/vo_s3fb.c
trunk/libvo/vo_sdl.c
trunk/libvo/vo_svga.c
trunk/libvo/vo_tdfx_vid.c
trunk/libvo/vo_tdfxfb.c
trunk/libvo/vo_tga.c
trunk/libvo/vo_v4l2.c
trunk/libvo/vo_vdpau.c
trunk/libvo/vo_vesa.c
trunk/libvo/vo_wii.c
trunk/libvo/vo_winvidix.c
trunk/libvo/vo_x11.c
trunk/libvo/vo_xover.c
trunk/libvo/vo_xv.c
trunk/libvo/vo_xvidix.c
trunk/libvo/vo_xvmc.c
trunk/libvo/vo_xvr100.c
trunk/libvo/vo_yuv4mpeg.c
trunk/libvo/vo_zr.c
trunk/libvo/vo_zr2.c
trunk/libvo/vosub_vidix.c
trunk/libvo/vosub_vidix.h
Modified: trunk/libvo/mga_template.c
==============================================================================
--- trunk/libvo/mga_template.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/mga_template.c Sat May 7 12:59:11 2011 (r33392)
@@ -236,7 +236,7 @@ static void mga_fullscreen(void)
}
#endif
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
case VOCTRL_QUERY_FORMAT:
Modified: trunk/libvo/vesa_lvo.c
==============================================================================
--- trunk/libvo/vesa_lvo.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vesa_lvo.c Sat May 7 12:59:11 2011 (r33392)
@@ -53,7 +53,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) )
@@ -309,7 +309,7 @@ static uint32_t vlvo_query_info(uint32_t
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:
Modified: trunk/libvo/video_out.h
==============================================================================
--- trunk/libvo/video_out.h Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/video_out.h Sat May 7 12:59:11 2011 (r33392)
@@ -147,7 +147,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.
Modified: trunk/libvo/video_out_internal.h
==============================================================================
--- trunk/libvo/video_out_internal.h Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/video_out_internal.h Sat May 7 12:59:11 2011 (r33392)
@@ -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);
Modified: trunk/libvo/vo_3dfx.c
==============================================================================
--- trunk/libvo/vo_3dfx.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_3dfx.c Sat May 7 12:59:11 2011 (r33392)
@@ -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:
Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_aa.c Sat May 7 12:59:11 2011 (r33392)
@@ -726,7 +726,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:
Modified: trunk/libvo/vo_bl.c
==============================================================================
--- trunk/libvo/vo_bl.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_bl.c Sat May 7 12:59:11 2011 (r33392)
@@ -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) {
case VOCTRL_QUERY_FORMAT:
return query_format(*((uint32_t*)data));
Modified: trunk/libvo/vo_caca.c
==============================================================================
--- trunk/libvo/vo_caca.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_caca.c Sat May 7 12:59:11 2011 (r33392)
@@ -335,7 +335,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)
{
Modified: trunk/libvo/vo_cvidix.c
==============================================================================
--- trunk/libvo/vo_cvidix.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_cvidix.c Sat May 7 12:59:11 2011 (r33392)
@@ -164,7 +164,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));
Modified: trunk/libvo/vo_dfbmga.c
==============================================================================
--- trunk/libvo/vo_dfbmga.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_dfbmga.c Sat May 7 12:59:11 2011 (r33392)
@@ -1409,7 +1409,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:
Modified: trunk/libvo/vo_dga.c
==============================================================================
--- trunk/libvo/vo_dga.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_dga.c Sat May 7 12:59:11 2011 (r33392)
@@ -984,7 +984,7 @@ static uint32_t get_image(mp_image_t * m
return VO_FALSE;
}
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request)
{
Modified: trunk/libvo/vo_direct3d.c
==============================================================================
--- trunk/libvo/vo_direct3d.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_direct3d.c Sat May 7 12:59:11 2011 (r33392)
@@ -760,7 +760,7 @@ err_out:
/** @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:
Modified: trunk/libvo/vo_directfb2.c
==============================================================================
--- trunk/libvo/vo_directfb2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_directfb2.c Sat May 7 12:59:11 2011 (r33392)
@@ -1372,7 +1372,7 @@ static uint32_t put_image(mp_image_t *mp
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
case VOCTRL_QUERY_FORMAT:
Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_directx.c Sat May 7 12:59:11 2011 (r33392)
@@ -1475,7 +1475,7 @@ static uint32_t color_ctrl_get(char *wha
return r;
}
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_dxr2.c Sat May 7 12:59:11 2011 (r33392)
@@ -920,7 +920,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:
Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_dxr3.c Sat May 7 12:59:11 2011 (r33392)
@@ -175,7 +175,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:
Modified: trunk/libvo/vo_fbdev.c
==============================================================================
--- trunk/libvo/vo_fbdev.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_fbdev.c Sat May 7 12:59:11 2011 (r33392)
@@ -1150,7 +1150,7 @@ static uint32_t get_image(mp_image_t *mp
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:
Modified: trunk/libvo/vo_fbdev2.c
==============================================================================
--- trunk/libvo/vo_fbdev2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_fbdev2.c Sat May 7 12:59:11 2011 (r33392)
@@ -397,7 +397,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:
Modified: trunk/libvo/vo_ggi.c
==============================================================================
--- trunk/libvo/vo_ggi.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_ggi.c Sat May 7 12:59:11 2011 (r33392)
@@ -467,7 +467,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:
Modified: trunk/libvo/vo_gif89a.c
==============================================================================
--- trunk/libvo/vo_gif89a.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_gif89a.c Sat May 7 12:59:11 2011 (r33392)
@@ -335,7 +335,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));
Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_gl.c Sat May 7 12:59:11 2011 (r33392)
@@ -1307,7 +1307,7 @@ static const struct {
{NULL, NULL, 0 }
};
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
case VOCTRL_PAUSE:
Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_gl2.c Sat May 7 12:59:11 2011 (r33392)
@@ -885,7 +885,7 @@ err_out:
return -1;
}
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
case VOCTRL_PAUSE:
Modified: trunk/libvo/vo_ivtv.c
==============================================================================
--- trunk/libvo/vo_ivtv.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_ivtv.c Sat May 7 12:59:11 2011 (r33392)
@@ -286,7 +286,7 @@ query_format (uint32_t format)
}
static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
{
switch (request)
{
Modified: trunk/libvo/vo_jpeg.c
==============================================================================
--- trunk/libvo/vo_jpeg.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_jpeg.c Sat May 7 12:59:11 2011 (r33392)
@@ -399,7 +399,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:
Modified: trunk/libvo/vo_kva.c
==============================================================================
--- trunk/libvo/vo_kva.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_kva.c Sat May 7 12:59:11 2011 (r33392)
@@ -949,7 +949,7 @@ static int color_ctrl_get(char *what, in
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:
Modified: trunk/libvo/vo_matrixview.c
==============================================================================
--- trunk/libvo/vo_matrixview.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_matrixview.c Sat May 7 12:59:11 2011 (r33392)
@@ -276,7 +276,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_PAUSE:
Modified: trunk/libvo/vo_md5sum.c
==============================================================================
--- trunk/libvo/vo_md5sum.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_md5sum.c Sat May 7 12:59:11 2011 (r33392)
@@ -259,7 +259,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:
Modified: trunk/libvo/vo_mpegpes.c
==============================================================================
--- trunk/libvo/vo_mpegpes.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_mpegpes.c Sat May 7 12:59:11 2011 (r33392)
@@ -241,7 +241,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:
Modified: trunk/libvo/vo_null.c
==============================================================================
--- trunk/libvo/vo_null.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_null.c Sat May 7 12:59:11 2011 (r33392)
@@ -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:
Modified: trunk/libvo/vo_png.c
==============================================================================
--- trunk/libvo/vo_png.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_png.c Sat May 7 12:59:11 2011 (r33392)
@@ -241,7 +241,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:
Modified: trunk/libvo/vo_pnm.c
==============================================================================
--- trunk/libvo/vo_pnm.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_pnm.c Sat May 7 12:59:11 2011 (r33392)
@@ -542,7 +542,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:
Modified: trunk/libvo/vo_quartz.c
==============================================================================
--- trunk/libvo/vo_quartz.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_quartz.c Sat May 7 12:59:11 2011 (r33392)
@@ -1158,7 +1158,7 @@ static uint32_t get_yuv_image(mp_image_t
return VO_FALSE;
}
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request)
{
Modified: trunk/libvo/vo_s3fb.c
==============================================================================
--- trunk/libvo/vo_s3fb.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_s3fb.c Sat May 7 12:59:11 2011 (r33392)
@@ -529,7 +529,7 @@ static uint32_t get_image(mp_image_t *mp
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:
Modified: trunk/libvo/vo_sdl.c
==============================================================================
--- trunk/libvo/vo_sdl.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_sdl.c Sat May 7 12:59:11 2011 (r33392)
@@ -1515,7 +1515,7 @@ static uint32_t get_image(mp_image_t *mp
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) {
Modified: trunk/libvo/vo_svga.c
==============================================================================
--- trunk/libvo/vo_svga.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_svga.c Sat May 7 12:59:11 2011 (r33392)
@@ -353,7 +353,7 @@ static int find_best_svga_mode(int req_w
return bestmode;
}
-static int control(uint32_t request, void *data, ...)
+static int control(uint32_t request, void *data)
{
switch (request) {
case VOCTRL_QUERY_FORMAT:
Modified: trunk/libvo/vo_tdfx_vid.c
==============================================================================
--- trunk/libvo/vo_tdfx_vid.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_tdfx_vid.c Sat May 7 12:59:11 2011 (r33392)
@@ -644,7 +644,7 @@ static uint32_t set_colorkey(mp_colorkey
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:
Modified: trunk/libvo/vo_tdfxfb.c
==============================================================================
--- trunk/libvo/vo_tdfxfb.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_tdfxfb.c Sat May 7 12:59:11 2011 (r33392)
@@ -496,7 +496,7 @@ static uint32_t get_image(mp_image_t *mp
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:
Modified: trunk/libvo/vo_tga.c
==============================================================================
--- trunk/libvo/vo_tga.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_tga.c Sat May 7 12:59:11 2011 (r33392)
@@ -219,7 +219,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:
Modified: trunk/libvo/vo_v4l2.c
==============================================================================
--- trunk/libvo/vo_v4l2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_v4l2.c Sat May 7 12:59:11 2011 (r33392)
@@ -254,7 +254,7 @@ query_format (uint32_t format)
}
static int
-control (uint32_t request, void *data, ...)
+control (uint32_t request, void *data)
{
switch (request)
{
Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_vdpau.c Sat May 7 12:59:11 2011 (r33392)
@@ -1314,7 +1314,7 @@ static int set_equalizer(char *name, int
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;
Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_vesa.c Sat May 7 12:59:11 2011 (r33392)
@@ -1083,7 +1083,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:
Modified: trunk/libvo/vo_wii.c
==============================================================================
--- trunk/libvo/vo_wii.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_wii.c Sat May 7 12:59:11 2011 (r33392)
@@ -351,7 +351,7 @@ static uint32_t get_image(mp_image_t *mp
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);
Modified: trunk/libvo/vo_winvidix.c
==============================================================================
--- trunk/libvo/vo_winvidix.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_winvidix.c Sat May 7 12:59:11 2011 (r33392)
@@ -330,7 +330,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);}
Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_x11.c Sat May 7 12:59:11 2011 (r33392)
@@ -655,7 +655,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)
{
Modified: trunk/libvo/vo_xover.c
==============================================================================
--- trunk/libvo/vo_xover.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_xover.c Sat May 7 12:59:11 2011 (r33392)
@@ -412,7 +412,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) {
Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_xv.c Sat May 7 12:59:11 2011 (r33392)
@@ -732,7 +732,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)
{
Modified: trunk/libvo/vo_xvidix.c
==============================================================================
--- trunk/libvo/vo_xvidix.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_xvidix.c Sat May 7 12:59:11 2011 (r33392)
@@ -389,7 +389,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)
{
Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_xvmc.c Sat May 7 12:59:11 2011 (r33392)
@@ -1291,7 +1291,7 @@ assert(rndr->shared.next_free_data_block
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:
Modified: trunk/libvo/vo_xvr100.c
==============================================================================
--- trunk/libvo/vo_xvr100.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_xvr100.c Sat May 7 12:59:11 2011 (r33392)
@@ -428,7 +428,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:
Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_yuv4mpeg.c Sat May 7 12:59:11 2011 (r33392)
@@ -297,7 +297,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:
Modified: trunk/libvo/vo_zr.c
==============================================================================
--- trunk/libvo/vo_zr.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_zr.c Sat May 7 12:59:11 2011 (r33392)
@@ -831,7 +831,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:
Modified: trunk/libvo/vo_zr2.c
==============================================================================
--- trunk/libvo/vo_zr2.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vo_zr2.c Sat May 7 12:59:11 2011 (r33392)
@@ -451,7 +451,7 @@ static int config(uint32_t width, uint32
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));
Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vosub_vidix.c Sat May 7 12:59:11 2011 (r33392)
@@ -62,7 +62,7 @@ static vidix_playback_t vidix_play;
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 @@ static uint32_t vidix_get_image(mp_image
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 @@ uint32_t vidix_control(uint32_t request,
}
}
return VO_NOTIMPL;
- // WARNING: we drop extra parameters (...) here!
// return server_control(request,data); //VO_NOTIMPL;
}
Modified: trunk/libvo/vosub_vidix.h
==============================================================================
--- trunk/libvo/vosub_vidix.h Sat May 7 12:44:57 2011 (r33391)
+++ trunk/libvo/vosub_vidix.h Sat May 7 12:59:11 2011 (r33392)
@@ -35,7 +35,7 @@ int vidix_init(unsigned src_width,u
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"
More information about the MPlayer-cvslog
mailing list