Mercurial > mplayer.hg
diff libvo/vo_winvidix.c @ 16171:fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.
author | ivo |
---|---|
date | Fri, 05 Aug 2005 01:24:37 +0000 |
parents | 0651bf280391 |
children | 7f34acc96aa4 |
line wrap: on
line diff
--- a/libvo/vo_winvidix.c Mon Aug 01 23:43:40 2005 +0000 +++ b/libvo/vo_winvidix.c Fri Aug 05 01:24:37 2005 +0000 @@ -181,7 +181,7 @@ } -static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_height, uint32_t flags, char *title, uint32_t format){ +static int config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_height, uint32_t flags, char *title, uint32_t format){ title = "MPlayer VIDIX WIN32 Overlay"; panscan_init(); @@ -281,7 +281,7 @@ return; } -static uint32_t draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){ +static int draw_slice(uint8_t *src[], int stride[],int w, int h, int x, int y){ UNUSED(src); UNUSED(stride); UNUSED(w); @@ -292,13 +292,13 @@ return(-1); } -static uint32_t draw_frame(uint8_t *src[]){ +static int draw_frame(uint8_t *src[]){ UNUSED(src); mp_msg(MSGT_VO, MSGL_FATAL, "[winvidix] error: didn't use vidix draw_frame!\n"); return(-1); } -static uint32_t query_format(uint32_t format){ +static int query_format(uint32_t format){ return(vidix_query_fourcc(format)); } @@ -315,7 +315,7 @@ // } -static uint32_t preinit(const char *arg){ +static int preinit(const char *arg){ if (arg) vidix_name = strdup(arg); else @@ -330,7 +330,7 @@ return(0); } -static uint32_t 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);}