May 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r33400 - in trunk/libvo: vo_dfbmga.c x11_common.c x11_common.h
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 20:48:31 2011 New Revision: 33400 Log: Add "const" to equalizer name argument to avoid compiler warnings. Modified: trunk/libvo/vo_dfbmga.c trunk/libvo/x11_common.c trunk/libvo/x11_common.h Modified: trunk/libvo/vo_dfbmga.c ============================================================================== --- trunk/libvo/vo_dfbmga.c Sat May 7 20:44:29 2011 (r33399) +++ trunk/libvo/vo_dfbmga.c Sat May 7 20:48:31 2011 (r33400) @@ -1335,7 +1335,7 @@ draw_image( mp_image_t *mpi ) } static int -set_equalizer( char *data, int value ) +set_equalizer( const char *data, int value ) { DFBResult res; DFBColorAdjustment ca; @@ -1375,7 +1375,7 @@ set_equalizer( char *data, int value ) } static int -get_equalizer( char *data, int *value ) +get_equalizer( const char *data, int *value ) { DFBResult res; DFBColorAdjustment ca; Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Sat May 7 20:44:29 2011 (r33399) +++ trunk/libvo/x11_common.c Sat May 7 20:48:31 2011 (r33400) @@ -1827,7 +1827,7 @@ static int transform_color(float val, return (unsigned short) (s * 65535); } -uint32_t vo_x11_set_equalizer(char *name, int value) +uint32_t vo_x11_set_equalizer(const char *name, int value) { float gamma, brightness, contrast; float rf, gf, bf; @@ -1878,7 +1878,7 @@ uint32_t vo_x11_set_equalizer(char *name return VO_TRUE; } -uint32_t vo_x11_get_equalizer(char *name, int *value) +uint32_t vo_x11_get_equalizer(const char *name, int *value) { if (cmap == None) return VO_NOTAVAIL; Modified: trunk/libvo/x11_common.h ============================================================================== --- trunk/libvo/x11_common.h Sat May 7 20:44:29 2011 (r33399) +++ trunk/libvo/x11_common.h Sat May 7 20:48:31 2011 (r33400) @@ -76,8 +76,8 @@ void vo_x11_fullscreen( void ); void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer ); void vo_x11_uninit(void); Colormap vo_x11_create_colormap(XVisualInfo *vinfo); -uint32_t vo_x11_set_equalizer(char *name, int value); -uint32_t vo_x11_get_equalizer(char *name, int *value); +uint32_t vo_x11_set_equalizer(const char *name, int value); +uint32_t vo_x11_get_equalizer(const char *name, int *value); void fstype_help(void); Window vo_x11_create_smooth_window( Display *mDisplay, Window mRoot, Visual *vis, int x, int y, unsigned int width, unsigned int height,

1 0

r33399 - trunk/libvo/vo_directfb2.c
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 20:44:29 2011 New Revision: 33399 Log: Add "const" to avoid compiler warnings. Modified: trunk/libvo/vo_directfb2.c Modified: trunk/libvo/vo_directfb2.c ============================================================================== --- trunk/libvo/vo_directfb2.c Sat May 7 18:29:57 2011 (r33398) +++ trunk/libvo/vo_directfb2.c Sat May 7 20:44:29 2011 (r33399) @@ -984,7 +984,7 @@ static void uninit(void) } -static uint32_t directfb_set_video_eq(char *data, int value) //data==name +static uint32_t directfb_set_video_eq(const char *data, int value) //data==name { DFBColorAdjustment ca; @@ -1042,7 +1042,7 @@ if (layer) { } -static uint32_t directfb_get_video_eq(char *data, int *value) // data==name +static uint32_t directfb_get_video_eq(const char *data, int *value) // data==name { DFBColorAdjustment ca;

1 0

r33398 - trunk/libmpcodecs/vf_smartblur.c
by cboesch 07 May '11

07 May '11

Author: cboesch Date: Sat May 7 18:29:57 2011 New Revision: 33398 Log: vf_smartblur: fix threshold condition. The threshold condition was broken (spotted because of a bad cast warning) and should now be fixed and using both luma and chroma threshold. The patch also fixes setting MP_IMGFLAG_READABLE (priorities fixed with the brackets) in the vf_get_image call. Modified: trunk/libmpcodecs/vf_smartblur.c Modified: trunk/libmpcodecs/vf_smartblur.c ============================================================================== --- trunk/libmpcodecs/vf_smartblur.c Sat May 7 18:16:23 2011 (r33397) +++ trunk/libmpcodecs/vf_smartblur.c Sat May 7 18:29:57 2011 (r33398) @@ -183,11 +183,11 @@ static inline void blur(uint8_t *dst, ui static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; - FilterParam *f= &vf->priv; + int threshold = vf->priv->luma.threshold || vf->priv->chroma.threshold; mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE| - (f->threshold) ? MP_IMGFLAG_READABLE : 0, + (threshold ? MP_IMGFLAG_READABLE : 0), mpi->w,mpi->h); assert(mpi->flags&MP_IMGFLAG_PLANAR);

1 0

r33397 - trunk/configure
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 18:16:23 2011 New Revision: 33397 Log: Fix matrixview test, it would stay stuck at "auto". Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat May 7 17:58:06 2011 (r33396) +++ trunk/configure Sat May 7 18:16:23 2011 (r33397) @@ -5184,8 +5184,8 @@ echores "$_gl" echocheck "MatrixView" -if test "$matrixview" = auto && test "$_gl" = no ; then - matrixview=no +if test "$matrixview" = auto ; then + matrixview="$_gl" fi if test "$matrixview" = yes ; then vomodules="matrixview $vomodules"

1 0

r33396 - in trunk/gui: interface.c interface.h
by ib 07 May '11

07 May '11

Author: ib Date: Sat May 7 17:58:06 2011 New Revision: 33396 Log: Declare parameter type for guiExit() more precisely. This is possible now that guiExit() isn't longer called by guiDone() with parameter DONE. Modified: trunk/gui/interface.c trunk/gui/interface.h Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat May 7 17:34:10 2011 (r33395) +++ trunk/gui/interface.c Sat May 7 17:58:06 2011 (r33396) @@ -40,7 +40,6 @@ #include "libvo/video_out.h" #include "libvo/x11_common.h" #include "mixer.h" -#include "mp_core.h" #include "mp_msg.h" #include "mpcommon.h" #include "mplayer.h" @@ -414,7 +413,7 @@ void guiDone(void) } } -void guiExit(int how) +void guiExit(enum exit_reason how) { exit_player_with_rc(how, how >= EXIT_ERROR); } Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Sat May 7 17:34:10 2011 (r33395) +++ trunk/gui/interface.h Sat May 7 17:58:06 2011 (r33396) @@ -21,6 +21,7 @@ #include "config.h" #include "m_config.h" +#include "mp_core.h" #include "playtree.h" #include "stream/stream.h" @@ -239,7 +240,7 @@ char *gstrdup(const char *str); void *gtkSet(int cmd, float fparam, void *vparam); void guiDone(void); void guiEventHandling(void); -void guiExit(int how); +void guiExit(enum exit_reason how); int guiGetEvent(int type, void *arg); void guiInit(void); void guiLoadFont(void);

1 0

r33395 - trunk/gui/interface.c
by ib 07 May '11

07 May '11

Author: ib Date: Sat May 7 17:34:10 2011 New Revision: 33395 Log: Cosmetic: Adjust indent. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat May 7 17:30:14 2011 (r33394) +++ trunk/gui/interface.c Sat May 7 17:34:10 2011 (r33395) @@ -384,26 +384,26 @@ void guiInit(void) void guiDone(void) { if (initialized) { - mplMainRender = 0; + mplMainRender = 0; - mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] done.\n"); + mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] done.\n"); - if (gui_save_pos) { - gui_main_pos_x = appMPlayer.mainWindow.X; - gui_main_pos_y = appMPlayer.mainWindow.Y; - gui_sub_pos_x = appMPlayer.subWindow.X; - gui_sub_pos_y = appMPlayer.subWindow.Y; - } + if (gui_save_pos) { + gui_main_pos_x = appMPlayer.mainWindow.X; + gui_main_pos_y = appMPlayer.mainWindow.Y; + gui_sub_pos_x = appMPlayer.subWindow.X; + gui_sub_pos_y = appMPlayer.subWindow.Y; + } #ifdef CONFIG_ASS - ass_enabled = gtkASS.enabled; - ass_use_margins = gtkASS.use_margins; - ass_top_margin = gtkASS.top_margin; - ass_bottom_margin = gtkASS.bottom_margin; + ass_enabled = gtkASS.enabled; + ass_use_margins = gtkASS.use_margins; + ass_top_margin = gtkASS.top_margin; + ass_bottom_margin = gtkASS.bottom_margin; #endif - cfg_write(); - wsXDone(); + cfg_write(); + wsXDone(); } appFreeStruct();

1 0

r33394 - in trunk: gui/interface.c mplayer.c
by ib 07 May '11

07 May '11

Author: ib Date: Sat May 7 17:30:14 2011 New Revision: 33394 Log: Set GUI initialization flag earlier. So far, the flag is set after the call of guiInit(), but there are calls to GUI functions (like reading the GUI config) before that. As MPlayer (when exiting) only calls GUI's cleanup function guiDone() if the flag is set, it neglects calling guiDone() on any error between the first GUI function call and execution of guiInit(). Now the flag is set before the first GUI function call. As a result, GUI's own exit function (also used for fatal GUI errors, and thus also for errors occurring before guiInit() properly finishes) doesn't have to handle cleanup any longer. The code can be moved to guiDone(). Modified: trunk/gui/interface.c trunk/mplayer.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat May 7 13:11:07 2011 (r33393) +++ trunk/gui/interface.c Sat May 7 17:30:14 2011 (r33394) @@ -52,8 +52,6 @@ #include "stream/stream_dvd.h" #endif -#define DONE -1 - guiInterface_t guiIntfStruct; int guiWinID = -1; @@ -385,6 +383,7 @@ void guiInit(void) void guiDone(void) { + if (initialized) { mplMainRender = 0; mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] done.\n"); @@ -405,31 +404,19 @@ void guiDone(void) cfg_write(); wsXDone(); + } - guiExit(DONE); + appFreeStruct(); + + if (gui_conf) { + m_config_free(gui_conf); + gui_conf = NULL; + } } -// NOTE TO MYSELF: Before calling guiInit(), MPlayer calls GUI functions -// cfg_read() and import_initial_playtree_into_gui(). Only -// after guiInit() has been called successfully, guiDone() -// (and thus guiExit()) will be executed by MPlayer on exit. -// In other words, any MPlayer's exit between cfg_read() and -// guiInit() will not execute guiDone(). -// With this function it is at least possible to handle -// GUI's own abortions during (and before) guiInit(). void guiExit(int how) { - if (!initialized || (how == DONE)) { - if (gui_conf) { - m_config_free(gui_conf); - gui_conf = NULL; - } - - appFreeStruct(); - } - - if (how != DONE) - exit_player_with_rc(how, how >= EXIT_ERROR); + exit_player_with_rc(how, how >= EXIT_ERROR); } void guiLoadFont(void) Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat May 7 13:11:07 2011 (r33393) +++ trunk/mplayer.c Sat May 7 17:30:14 2011 (r33394) @@ -2757,7 +2757,10 @@ int gui_no_filename=0; parse_cfgfiles(mconfig); #ifdef CONFIG_GUI - if ( use_gui ) cfg_read(); + if ( use_gui ) { + initialized_flags|=INITIALIZED_GUI; + cfg_read(); + } #endif mpctx->playtree = m_config_parse_mp_command_line(mconfig, argc, argv); @@ -3018,7 +3021,6 @@ current_module = NULL; if(use_gui){ guiInit(); guiGetEvent(guiSetContext, mpctx); - initialized_flags|=INITIALIZED_GUI; guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) ); } #endif

1 0

r33352 - in trunk/gui: cfg.c cfg.h interface.c
by ib 07 May '11

07 May '11

Author: ib Date: Tue May 3 15:19:39 2011 New Revision: 33352 Log: Free config. It isn't freed so far. Modified: trunk/gui/cfg.c trunk/gui/cfg.h trunk/gui/interface.c Modified: trunk/gui/cfg.c ============================================================================== --- trunk/gui/cfg.c Tue May 3 14:21:11 2011 (r33351) +++ trunk/gui/cfg.c Tue May 3 15:19:39 2011 (r33352) @@ -28,7 +28,6 @@ #include "libmpcodecs/vd.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "m_config.h" #include "m_option.h" #include "mixer.h" #include "mp_msg.h" @@ -39,6 +38,8 @@ #include "sub/font_load.h" #include "sub/sub.h" +m_config_t *gui_conf; + int gtkCacheOn; int gtkCacheSize = 2048; @@ -96,8 +97,6 @@ int gui_main_pos_y = -3; int gui_sub_pos_x = -3; int gui_sub_pos_y = -3; -static m_config_t *gui_conf; - static const m_option_t gui_opts[] = { { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL }, Modified: trunk/gui/cfg.h ============================================================================== --- trunk/gui/cfg.h Tue May 3 14:21:11 2011 (r33351) +++ trunk/gui/cfg.h Tue May 3 15:19:39 2011 (r33352) @@ -19,6 +19,10 @@ #ifndef MPLAYER_GUI_CFG_H #define MPLAYER_GUI_CFG_H +#include "m_config.h" + +extern m_config_t *gui_conf; + extern int gtkCacheOn; extern int gtkCacheSize; Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue May 3 14:21:11 2011 (r33351) +++ trunk/gui/interface.c Tue May 3 15:19:39 2011 (r33352) @@ -72,6 +72,8 @@ char *fsHistory[fsPersistant_MaxPos] = { float gtkEquChannels[6][10]; +static int initialized; + int gstrcmp(const char *a, const char *b) { if (!a && !b) @@ -379,6 +381,8 @@ void guiInit(void) guiSetFilename(guiIntfStruct.Subtitlename, subdata->filename); guiLoadFont(); + + initialized = 1; } void guiDone(void) @@ -417,6 +421,13 @@ void guiDone(void) // GUI's own abortions during (and before) guiInit(). void guiExit(int how) { + if (!initialized || (how == DONE)) { + if (gui_conf) { + m_config_free(gui_conf); + gui_conf = NULL; + } + } + if (how != DONE) exit_player(how); }

3 7

r33393 - in trunk: help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp-ru.h help/help_mp-sk....
by reimar 07 May '11

07 May '11

Author: reimar Date: Sat May 7 13:11:07 2011 New Revision: 33393 Log: Fix output of "No bind found for key" to actually make sense for key combinations and match the binding you'd have to add to input.conf also for these. Previously the extra keys would end up appended at the end, resulting in output like > No bind found for key 'MOUSE_BTN0'.-MOUSE_BTN2 and even worse for some translations. Modified: trunk/input/input.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-tr.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Sat May 7 12:59:11 2011 (r33392) +++ trunk/input/input.c Sat May 7 13:11:07 2011 (r33393) @@ -1090,13 +1090,14 @@ mp_input_get_cmd_from_keys(int n,int* ke cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys); if(cmd == NULL) { - mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,mp_input_get_key_name(keys[0])); - if(n > 1) { - int s; - for(s=1; s < n; s++) - mp_msg(MSGT_INPUT,MSGL_WARN,"-%s",mp_input_get_key_name(keys[s])); + char key_name[100]; + int i; + av_strlcpy(key_name, mp_input_get_key_name(keys[0]), sizeof(key_name)); + for (i = 1; i < n; i++) { + av_strlcat(key_name, "-", sizeof(key_name)); + av_strlcat(key_name, mp_input_get_key_name(keys[i]), sizeof(key_name)); } - mp_msg(MSGT_INPUT,MSGL_WARN," \n"); + mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,key_name); return NULL; } if (strcmp(cmd, "ignore") == 0) return NULL;

1 0

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...
by iive 07 May '11

07 May '11

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"

1 0